x/vmware-nsx-tempest-plugin
Code Issues Proposed changes

Merge "[Designate]:Adding back changes which were removed"

Browse Source
This commit is contained in:
Zuul 2018-05-31 05:24:54 +00:00 committed by Gerrit Code Review
commit 6db8844e71
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmware_nsx_tempest/lib/appliance_manager.py
View File

@ -434,6 +434,14 @@ class ApplianceManager(manager.NetworkScenarioTest):
self.topology_servers[server_name] = server self.topology_servers[server_name] = server
return 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): def _list_ports(self, *args, **kwargs):
"""List ports using admin creds """ """List ports using admin creds """
ports_list = self.os_admin.ports_client.list_ports( ports_list = self.os_admin.ports_client.list_ports(

5
vmware_nsx_tempest/services/openstack_network_clients.py
View File

@ -470,3 +470,8 @@ class ZonesV2Client(designate_base.DnsClientBase):
def list_zones(self): def list_zones(self):
return self._list_request(self.resource_base_path) 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

7
vmware_nsx_tempest/tests/scenario/test_designate.py
View File

@ -71,7 +71,7 @@ class TestZonesV2Ops(feature_manager.FeatureManager):
return zone return zone
def create_zone_topology(self, zone_name): 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 = self.create_topology_network(
"network_designate", networks_client=networks_client, "network_designate", networks_client=networks_client,
dns_domain=zone_name) dns_domain=zone_name)
@ -201,8 +201,9 @@ class TestZonesScenario(TestZonesV2Ops):
fip = dns_vm['floating_ips'][0]['floating_ip_address'] fip = dns_vm['floating_ips'][0]['floating_ip_address']
self.verify_recordset(recordset, 3) self.verify_recordset(recordset, 3)
self.verify_recordset_floatingip(recordset, fip) self.verify_recordset_floatingip(recordset, fip)
self.delete_floatingip(dns_vm['floating_ips'][0]) fip_id = dns_vm['floating_ips'][0]['id']
self.delete_topology_instance(dns_vm) 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') LOG.info('Show recordset of the zone')
recordset = self.list_record_set_zone(zone['id']) recordset = self.list_record_set_zone(zone['id'])
self.verify_recordset(recordset, 2) self.verify_recordset(recordset, 2)