remove s2id from the locator

airgun/views/capsule.py

@@ -47,8 +47,8 @@ class CreateCapsuleView(BaseLoggedInView):
     class capsule(SatTab):
         name = TextInput(locator='//input[@id="smart_proxy_name"]')
         url = TextInput(locator='//input[@id="smart_proxy_url"]')
-        acs_http_proxy = FilteredDropdown(id='s2id_smart_proxy_http_proxy_id')
-        remove_proxy_selection = Text(locator='//*[@id="s2id_smart_proxy_http_proxy_id"]/a/abbr')
+        acs_http_proxy = FilteredDropdown(id='smart_proxy_http_proxy_id')
+        remove_proxy_selection = Text(locator='//*[@id="smart_proxy_http_proxy_id"]/a/abbr')
 
     @View.nested
     class locations(SatTab):
@@ -68,9 +68,9 @@ class EditCapsuleView(CreateCapsuleView):
     class capsule(SatTab):
         name = TextInput(locator='//input[@id="smart_proxy_name"]')
         url = TextInput(locator='//input[@id="smart_proxy_url"]')
-        download_policy = FilteredDropdown(id='s2id_smart_proxy_download_policy')
-        acs_http_proxy = FilteredDropdown(id='s2id_smart_proxy_http_proxy_id')
-        remove_proxy_selection = Text(locator='//*[@id="s2id_smart_proxy_http_proxy_id"]/a/abbr')
+        download_policy = FilteredDropdown(id='smart_proxy_download_policy')
+        acs_http_proxy = FilteredDropdown(id='smart_proxy_http_proxy_id')
+        remove_proxy_selection = Text(locator='//*[@id="smart_proxy_http_proxy_id"]/a/abbr')
 
     @View.nested
     class lifecycle_enviroments(SatTab):

airgun/views/computeresource.py

@@ -63,7 +63,7 @@ class EC2ProviderForm(View):
         @View.nested
         class region(View):
             load_regions = Text("//a[contains(@id,'test_connection_button')]")
-            value = FilteredDropdown(id='s2id_compute_resource_region')
+            value = FilteredDropdown(id='compute_resource_region')
 
             def before_fill(self, values=None):
                 self.load_regions.click()
@@ -80,7 +80,7 @@ class GCEProviderForm(View):
         @View.nested
         class zone(View):
             load_zones = Text("//a[contains(@id,'test_connection_button')]")
-            value = FilteredDropdown(id='s2id_compute_resource_zone')
+            value = FilteredDropdown(id='compute_resource_zone')
 
             def before_fill(self, values=None):
                 self.load_zones.click()
@@ -121,7 +121,7 @@ class VMwareProviderForm(View):
         @View.nested
         class datacenter(View):
             load_datacenters = Text("//a[contains(@id,'test_connection_button')]")
-            value = FilteredDropdown(id='s2id_compute_resource_datacenter')
+            value = FilteredDropdown(id='compute_resource_datacenter')
 
             def before_fill(self, values=None):
                 self.load_datacenters.click()
@@ -136,7 +136,7 @@ class RHVProviderForm(View):
         @View.nested
         class datacenter(View):
             load_datacenters = Text("//a[contains(@id,'test_connection_button')]")
-            value = FilteredDropdown(id='s2id_compute_resource_uuid')
+            value = FilteredDropdown(id='compute_resource_uuid')
 
             def before_fill(self, values=None):
                 self.load_datacenters.click()
@@ -331,8 +331,8 @@ class ComputeResourceVMwareProfileStorageItem(GenericRemovableWidgetItem):
 
 class ResourceProviderProfileView(BaseLoggedInView):
     breadcrumb = BreadCrumb()
-    compute_profile = FilteredDropdown(id='s2id_compute_attribute_compute_profile_id')
-    compute_resource = FilteredDropdown(id='s2id_compute_attribute_compute_resource_id')
+    compute_profile = FilteredDropdown(id='compute_attribute_compute_profile_id')
+    compute_resource = FilteredDropdown(id='compute_attribute_compute_resource_id')
 
     provider_content = ConditionalSwitchableView(reference='current_provider')
 
@@ -356,7 +356,7 @@ def current_provider(self):
     class LibvirtResourceForm(View):
         cpus = TextInput(id='compute_attribute_vm_attrs_cpus')
         memory = TextInput(id='compute_attribute_vm_attrs_memory')
-        image = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_image_id')
+        image = FilteredDropdown(id='compute_attribute_vm_attrs_image_id')
 
         @View.nested
         class network_interfaces(RemovableWidgetsItemsListView):
@@ -371,26 +371,26 @@ class storage(RemovableWidgetsItemsListView):
 
     @provider_content.register('EC2')
     class EC2ResourceForm(View):
-        flavor = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_flavor_id')
-        image = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_image_id')
-        availability_zone = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_availability_zone')
-        subnet = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_subnet_id')
+        flavor = FilteredDropdown(id='compute_attribute_vm_attrs_flavor_id')
+        image = FilteredDropdown(id='compute_attribute_vm_attrs_image_id')
+        availability_zone = FilteredDropdown(id='compute_attribute_vm_attrs_availability_zone')
+        subnet = FilteredDropdown(id='compute_attribute_vm_attrs_subnet_id')
         security_groups = MultiSelect(id='ms-compute_attribute_vm_attrs_security_group_ids')
-        managed_ip = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_managed_ip')
+        managed_ip = FilteredDropdown(id='compute_attribute_vm_attrs_managed_ip')
 
     @provider_content.register('Google')
     class GCEResourceForm(View):
-        machine_type = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_machine_type')
-        image = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_image_id')
-        network = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_network')
+        machine_type = FilteredDropdown(id='compute_attribute_vm_attrs_machine_type')
+        image = FilteredDropdown(id='compute_attribute_vm_attrs_image_id')
+        network = FilteredDropdown(id='compute_attribute_vm_attrs_network')
         external_ip = Checkbox(id='compute_attribute_vm_attrs_associate_external_ip')
         default_disk_size = TextInput(id='compute_attribute_vm_attrs_volumes_attributes_0_size_gb')
 
     @provider_content.register('RHV')
     class RHVResourceForm(View):
-        cluster = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_cluster')
-        template = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_template')
-        instance_type = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_instance_type')
+        cluster = FilteredDropdown(id='compute_attribute_vm_attrs_cluster')
+        template = FilteredDropdown(id='compute_attribute_vm_attrs_template')
+        instance_type = FilteredDropdown(id='compute_attribute_vm_attrs_instance_type')
         cores = TextInput(id='compute_attribute_vm_attrs_cores')
         sockets = TextInput(id='compute_attribute_vm_attrs_sockets')
         memory = TextInput(id='compute_attribute_vm_attrs_memory')
@@ -415,16 +415,16 @@ class VMwareResourceForm(View):
         firmware = RadioGroup(
             "//div[label[input[contains(@id, 'compute_attribute_vm_attrs_firmware')]]]"
         )
-        cluster = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_cluster')
-        resource_pool = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_resource_pool')
-        folder = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_path')
-        guest_os = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_guest_id')
-        virtual_hw_version = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_hardware_version')
+        cluster = FilteredDropdown(id='compute_attribute_vm_attrs_cluster')
+        resource_pool = FilteredDropdown(id='compute_attribute_vm_attrs_resource_pool')
+        folder = FilteredDropdown(id='compute_attribute_vm_attrs_path')
+        guest_os = FilteredDropdown(id='compute_attribute_vm_attrs_guest_id')
+        virtual_hw_version = FilteredDropdown(id='compute_attribute_vm_attrs_hardware_version')
         memory_hot_add = Checkbox(id='compute_attribute_vm_attrs_memoryHotAddEnabled')
         cpu_hot_add = Checkbox(id='compute_attribute_vm_attrs_cpuHotAddEnabled')
         cdrom_drive = Checkbox(id='compute_attribute_vm_attrs_add_cdrom')
         annotation_notes = TextInput(id='compute_attribute_vm_attrs_annotation')
-        image = FilteredDropdown(id='s2id_compute_attribute_vm_attrs_image_id')
+        image = FilteredDropdown(id='compute_attribute_vm_attrs_image_id')
 
         @View.nested
         class network_interfaces(RemovableWidgetsItemsListView):

airgun/views/host.py

@@ -281,10 +281,10 @@ class host(SatTab):
         inherit_compute_profile_option = ToggleButton(
             locator=".//div[label[@for='compute_profile_id']]//button"
         )
-        compute_profile = FilteredDropdown(id='s2id_host_compute_profile_id')
+        compute_profile = FilteredDropdown(id='host_compute_profile_id')
         lce = FilteredDropdown(id='host_lifecycle_environment')
         content_view = FilteredDropdown(id='host_content_view')
-        content_source = FilteredDropdown(id='s2id_content_source_id')
+        content_source = FilteredDropdown(id='content_source_id')
         reset_puppet_environment = Link(".//a[@id='reset_puppet_environment']")
         inherit_puppet_environment = ToggleButton(
             locator=".//div[label[@for='environment_id']]//button"
@@ -345,8 +345,8 @@ class GoogleResourceForm(View):
         @View.nested
         class virtual_machine(SatTab):
             TAB_NAME = 'Virtual Machine'
-            machine_type = FilteredDropdown(id='s2id_host_compute_attributes_machine_type')
-            network = FilteredDropdown(id='s2id_host_compute_attributes_network')
+            machine_type = FilteredDropdown(id='host_compute_attributes_machine_type')
+            network = FilteredDropdown(id='host_compute_attributes_network')
             external_ip = Checkbox(id='host_compute_attributes_associate_external_ip')
 
             @View.nested
@@ -360,23 +360,23 @@ class AzureRmResourceForm(View):
         @View.nested
         class virtual_machine(SatTab):
             TAB_NAME = 'Virtual Machine'
-            resource_group = FilteredDropdown(id='s2id_azure_rm_rg')
-            vm_size = FilteredDropdown(id='s2id_azure_rm_size')
-            platform = FilteredDropdown(id='s2id_host_compute_attributes_platform')
+            resource_group = FilteredDropdown(id='azure_rm_rg')
+            vm_size = FilteredDropdown(id='azure_rm_size')
+            platform = FilteredDropdown(id='host_compute_attributes_platform')
             username = TextInput(id='host_compute_attributes_username')
             password = TextInput(id='host_compute_attributes_password')
             ssh_key = TextInput(id='host_compute_attributes_ssh_key_data')
             premium_os_disk = Checkbox(id='host_compute_attributes_premium_os_disk')
-            os_disk_caching = FilteredDropdown(id="s2id_host_compute_attributes_os_disk_caching")
+            os_disk_caching = FilteredDropdown(id="host_compute_attributes_os_disk_caching")
             custom_script_command = TextInput(id="host_compute_attributes_script_command")
             file_uris = TextInput(id="host_compute_attributes_script_uris")
 
         @View.nested
         class operating_system(SatTab):
             TAB_NAME = 'Operating System'
 
-            architecture = FilteredDropdown(id='s2id_host_architecture_id')
-            operating_system = FilteredDropdown(id='s2id_host_operatingsystem_id')
+            architecture = FilteredDropdown(id='host_architecture_id')
+            operating_system = FilteredDropdown(id='host_operatingsystem_id')
             image = FilteredDropdown(id='azure_rm_image_id')
             root_password = TextInput(id='host_root_pass')
 

airgun/views/hostgroup.py

@@ -65,12 +65,12 @@ def is_displayed(self):
     class host_group(SatTab):
         TAB_NAME = 'Host Group'
 
-        parent_name = FilteredDropdown(id='s2id_hostgroup_parent_id')
+        parent_name = FilteredDropdown(id='hostgroup_parent_id')
         name = TextInput(id='hostgroup_name')
         description = TextInput(id='hostgroup_description')
         lce = FilteredDropdown(id='hostgroup_lifecycle_environment')
         content_view = FilteredDropdown(id='hostgroup_content_view')
-        content_source = FilteredDropdown(id='s2id_content_source_id')
+        content_source = FilteredDropdown(id='content_source_id')
         puppet_environment = FilteredDropdown(id='hostgroup_puppet_attributes_environment')
         deploy = FilteredDropdown(id='hostgroup_compute_resource')
         puppet_master = FilteredDropdown(id='hostgroup_puppet_proxy')

airgun/views/oscappolicy.py

@@ -97,27 +97,27 @@ def after_fill(self, was_change):
     class scap_content(BaseLoggedInView):
         TAB_NAME = 'SCAP Content'
         next_step = Text("//input[contains(@value, 'Next')]")
-        scap_content_resource = FilteredDropdown(id='s2id_policy_scap_content_id')
-        xccdf_profile = FilteredDropdown(id='s2id_policy_scap_content_profile_id')
-        tailoring_file = FilteredDropdown(id='s2id_policy_tailoring_file_id')
-        xccdf_profile_tailoring_file = FilteredDropdown(id='s2id_policy_tailoring_file_profile_id')
+        scap_content_resource = FilteredDropdown(id='policy_scap_content_id')
+        xccdf_profile = FilteredDropdown(id='policy_scap_content_profile_id')
+        tailoring_file = FilteredDropdown(id='policy_tailoring_file_id')
+        xccdf_profile_tailoring_file = FilteredDropdown(id='policy_tailoring_file_profile_id')
 
         def after_fill(self, was_change):
             self.next_step.click()
 
     @View.nested
     class schedule(BaseLoggedInView):
         next_step = Text("//input[contains(@value, 'Next')]")
-        period = FilteredDropdown(id='s2id_policy_period')
+        period = FilteredDropdown(id='policy_period')
         period_selection = ConditionalSwitchableView(reference='period')
 
         @period_selection.register('Weekly')
         class WeeklyPeriodForm(View):
-            weekday = FilteredDropdown(id='s2id_policy_weekday')
+            weekday = FilteredDropdown(id='policy_weekday')
 
         @period_selection.register('Monthly')
         class MonthlyPeriodForm(View):
-            day_of_month = FilteredDropdown(id='s2id_policy_day_of_month')
+            day_of_month = FilteredDropdown(id='policy_day_of_month')
 
         @period_selection.register('Custom')
         class CustomPeriodForm(View):
@@ -176,23 +176,23 @@ class general(SatTab):
     @View.nested
     class scap_content(SatTab):
         TAB_NAME = 'SCAP Content'
-        scap_content = FilteredDropdown(id='s2id_policy_scap_content_id')
-        xccdf_profile = FilteredDropdown(id='s2id_policy_scap_content_profile_id')
-        tailoring_file = FilteredDropdown(id='s2id_policy_tailoring_file_id')
-        xccdf_profile_tailoring_file = FilteredDropdown(id='s2id_policy_tailoring_file_profile_id')
+        scap_content = FilteredDropdown(id='policy_scap_content_id')
+        xccdf_profile = FilteredDropdown(id='policy_scap_content_profile_id')
+        tailoring_file = FilteredDropdown(id='policy_tailoring_file_id')
+        xccdf_profile_tailoring_file = FilteredDropdown(id='policy_tailoring_file_profile_id')
 
     @View.nested
     class schedule(SatTab):
-        period = FilteredDropdown(id='s2id_policy_period')
+        period = FilteredDropdown(id='policy_period')
         period_selection = ConditionalSwitchableView(reference='period')
 
         @period_selection.register('Weekly')
         class WeeklyPeriodForm(View):
-            weekday = FilteredDropdown(id='s2id_policy_weekday')
+            weekday = FilteredDropdown(id='policy_weekday')
 
         @period_selection.register('Monthly')
         class MonthlyPeriodForm(View):
-            day_of_month = FilteredDropdown(id='s2id_policy_day_of_month')
+            day_of_month = FilteredDropdown(id='policy_day_of_month')
 
         @period_selection.register('Custom')
         class CustomPeriodForm(View):

airgun/views/partitiontable.py

@@ -56,7 +56,7 @@ class SnippetOption(View):
 
         @os_family_selection.register(False)
         class OSFamilyOption(View):
-            os_family = FilteredDropdown(id='s2id_ptable_os_family')
+            os_family = FilteredDropdown(id='ptable_os_family')
 
         template_editor = ACEEditor()
         audit_comment = TextInput(id='ptable_audit_comment')

airgun/views/report_template.py

@@ -89,12 +89,12 @@ class ReportTemplateGenerateView(BaseLoggedInView):
     email = Checkbox(id='report_template_report_send_mail')
     email_to = TextInput(id='report_template_report_mail_to')
     inputs = TextInputsGroup(locator='.//form')
-    output_format = FilteredDropdown(id='s2id_report_template_report_format')
+    output_format = FilteredDropdown(id='report_template_report_format')
     hosts_filter = TextInput(locator='//input[contains(@class,"search-input")]')
     generate_at = TextInput(id='report_template_report_generate_at')
     submit = Text('//input[@name="commit"]')
     generated = Text('//div[contains(@class, "alert-success")]')
-    installability = FilteredDropdown(id='s2id_Installability')
+    installability = FilteredDropdown(id='Installability')
 
     @property
     def is_displayed(self):

airgun/views/usergroup.py

@@ -68,7 +68,7 @@ class external_groups(SatTab):
         )
         auth_source = FilteredDropdown(
             locator=(
-                "//div[starts-with(@id, 's2id_usergroup_external_usergroups_attributes')]"
+                "//div[starts-with(@id, 'usergroup_external_usergroups_attributes')]"
                 "[contains(@id, 'auth_source_id')]"
             )
         )

airgun/widgets.py

@@ -1173,8 +1173,8 @@ def __init__(self, parent, id=None, locator=None, logger=None):
         super().__init__(parent, locator, logger)
 
     def read(self):
-        """Return drop-down selected item value"""
-        return self.browser.text(self.selected_value)
+        """Return drop-down selected item value and remove special character (×) using u00d7"""
+        return self.browser.text(self.selected_value).replace('\u00d7', '').strip()
 
     def clear(self):
         """Clear currently selected value for drop-down"""