From 7b0dd64368b1eea398c6dbcc0c0a6e75b7a3457e Mon Sep 17 00:00:00 2001 From: Deepthi Kandavara Jayarama Date: Thu, 24 May 2018 18:15:42 +0000 Subject: [PATCH] [Designate]:Adding back changes which were removed {0} vmware_nsx_tempest.tests.scenario.test_designate.TestZonesScenario.test_zone_deletion_post_fip_association [171.242557s] ... ok {0} vmware_nsx_tempest.tests.scenario.test_designate.TestZonesScenario.test_zone_list_with_fip_deletion_instance [48.157271s] ... ok {0} vmware_nsx_tempest.tests.scenario.test_designate.TestZonesScenario.test_zone_list_with_fip_instance [49.213131s] ... ok {0} vmware_nsx_tempest.tests.scenario.test_designate.TestZonesScenario.test_zone_list_with_fip_port [146.074342s] ... ok {0} vmware_nsx_tempest.tests.scenario.test_designate.TestZonesScenario.test_zone_list_without_fip_instance [49.825563s] ... ok {0} vmware_nsx_tempest.tests.scenario.test_designate.TestZonesScenario.test_zone_list_without_fip_port [28.125091s] ... ok {0} vmware_nsx_tempest.tests.scenario.test_designate.TestZonesScenario.test_zone_nslookup_from_extvm [172.577656s] ... ok Change-Id: Ib8e2fd76348fa01cc722a140aa9e69cbd068a9c1 --- vmware_nsx_tempest/lib/appliance_manager.py | 8 ++++++++ vmware_nsx_tempest/services/openstack_network_clients.py | 5 +++++ vmware_nsx_tempest/tests/scenario/test_designate.py | 7 ++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/vmware_nsx_tempest/lib/appliance_manager.py b/vmware_nsx_tempest/lib/appliance_manager.py index c2b5dd2..d733f6b 100644 --- a/vmware_nsx_tempest/lib/appliance_manager.py +++ b/vmware_nsx_tempest/lib/appliance_manager.py @@ -402,6 +402,14 @@ class ApplianceManager(manager.NetworkScenarioTest): self.topology_servers[server_name] = server return server + def create_topology_port(self, network, + ports_client=None, **args): + if not ports_client: + ports_client = self.ports_client + port = ports_client.create_port(network_id=network['id'], **args) + self.addCleanup(ports_client.delete_port, port['port']['id']) + return port + def _list_ports(self, *args, **kwargs): """List ports using admin creds """ ports_list = self.os_admin.ports_client.list_ports( diff --git a/vmware_nsx_tempest/services/openstack_network_clients.py b/vmware_nsx_tempest/services/openstack_network_clients.py index 56be5ac..a10664b 100644 --- a/vmware_nsx_tempest/services/openstack_network_clients.py +++ b/vmware_nsx_tempest/services/openstack_network_clients.py @@ -470,3 +470,8 @@ class ZonesV2Client(designate_base.DnsClientBase): def list_zones(self): return self._list_request(self.resource_base_path) + + def list_recordset_zone(self, zone_id): + request = self.resource_base_path + '/' + zone_id + '/recordsets' + resp, body = self._list_request(request) + return resp, body diff --git a/vmware_nsx_tempest/tests/scenario/test_designate.py b/vmware_nsx_tempest/tests/scenario/test_designate.py index b3a39dd..bd10ace 100644 --- a/vmware_nsx_tempest/tests/scenario/test_designate.py +++ b/vmware_nsx_tempest/tests/scenario/test_designate.py @@ -71,7 +71,7 @@ class TestZonesV2Ops(feature_manager.FeatureManager): return zone def create_zone_topology(self, zone_name): - networks_client = self.os_admin.networks_client + networks_client = self.cmgr_adm.networks_client network_designate = self.create_topology_network( "network_designate", networks_client=networks_client, dns_domain=zone_name) @@ -201,8 +201,9 @@ class TestZonesScenario(TestZonesV2Ops): fip = dns_vm['floating_ips'][0]['floating_ip_address'] self.verify_recordset(recordset, 3) self.verify_recordset_floatingip(recordset, fip) - self.delete_floatingip(dns_vm['floating_ips'][0]) - self.delete_topology_instance(dns_vm) + fip_id = dns_vm['floating_ips'][0]['id'] + self.os_admin.floating_ips_client.delete_floatingip(fip_id) + self.os_admin.servers_client.delete_server(dns_vm['id']) LOG.info('Show recordset of the zone') recordset = self.list_record_set_zone(zone['id']) self.verify_recordset(recordset, 2)