diff --git a/openstack_dashboard/test/integration_tests/pages/project/compute/instancespage.py b/openstack_dashboard/test/integration_tests/pages/project/compute/instancespage.py index 236d9465d06..92a29234774 100644 --- a/openstack_dashboard/test/integration_tests/pages/project/compute/instancespage.py +++ b/openstack_dashboard/test/integration_tests/pages/project/compute/instancespage.py @@ -97,6 +97,7 @@ def create_instance( instance_count=DEFAULT_COUNT, flavor=DEFAULT_FLAVOR, boot_source=DEFAULT_BOOT_SOURCE, + network_type=DEFAULT_NETWORK_TYPE, source_name=None, device_size=None, vol_delete_on_instance_delete=DEFAULT_VOL_DELETE_ON_INSTANCE_DELETE @@ -187,6 +188,6 @@ def get_image_name(self, instance_name): def get_fixed_ipv4(self, name): row = self._get_row_with_instance_name(name) ips = row.cells[self.INSTANCES_TABLE_IP_COLUMN].text - for ip in ips.split(): + for ip in ips.split(','): if netaddr.valid_ipv4(ip): return ip diff --git a/openstack_dashboard/test/integration_tests/tests/test_floatingips.py b/openstack_dashboard/test/integration_tests/tests/test_floatingips.py index 29b57843d36..abbc388df8d 100644 --- a/openstack_dashboard/test/integration_tests/tests/test_floatingips.py +++ b/openstack_dashboard/test/integration_tests/tests/test_floatingips.py @@ -12,7 +12,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import pytest from openstack_dashboard.test.integration_tests import helpers from openstack_dashboard.test.integration_tests.regions import messages @@ -42,12 +41,11 @@ def test_floatingip(self): class TestFloatingipAssociateDisassociate(helpers.TestCase): """Checks that the user is able to Associate/Disassociate floatingip.""" - @pytest.mark.skip(reason="Bug 1920010 fix") def test_floatingip_associate_disassociate(self): instance_name = helpers.gen_random_resource_name('instance', timestamp=False) instances_page = self.home_pg.go_to_project_compute_instancespage() - instances_page.create_instance(instance_name) + instances_page.create_instance(instance_name, network_type='internal') self.assertTrue( instances_page.find_message_and_dismiss(messages.INFO)) self.assertFalse(