Tweaking other multiblade tests.
This commit is contained in:
parent
438514e9c1
commit
8a9133c183
|
@ -118,10 +118,14 @@ class L2NetworkMultiBlade(L2NetworkModelBase):
|
||||||
|
|
||||||
def delete_network(self, args):
|
def delete_network(self, args):
|
||||||
"""Support for the Quantum core API call"""
|
"""Support for the Quantum core API call"""
|
||||||
self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),
|
output = []
|
||||||
args)
|
ucs_output = self._invoke_plugin_per_device(const.UCS_PLUGIN,
|
||||||
self._invoke_plugin_per_device(const.NEXUS_PLUGIN,
|
|
||||||
self._func_name(), args)
|
self._func_name(), args)
|
||||||
|
nexus_output = self._invoke_plugin_per_device(const.NEXUS_PLUGIN,
|
||||||
|
self._func_name(), args)
|
||||||
|
output.extend(ucs_output or [])
|
||||||
|
output.extend(nexus_output or [])
|
||||||
|
return output
|
||||||
|
|
||||||
def get_network_details(self, args):
|
def get_network_details(self, args):
|
||||||
"""Not implemented for this model"""
|
"""Not implemented for this model"""
|
||||||
|
@ -129,10 +133,14 @@ class L2NetworkMultiBlade(L2NetworkModelBase):
|
||||||
|
|
||||||
def rename_network(self, args):
|
def rename_network(self, args):
|
||||||
"""Support for the Quantum core API call"""
|
"""Support for the Quantum core API call"""
|
||||||
self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),
|
output = []
|
||||||
args)
|
ucs_output = self._invoke_plugin_per_device(const.UCS_PLUGIN,
|
||||||
self._invoke_plugin_per_device(const.NEXUS_PLUGIN,
|
|
||||||
self._func_name(), args)
|
self._func_name(), args)
|
||||||
|
nexus_output = self._invoke_plugin_per_device(const.NEXUS_PLUGIN,
|
||||||
|
self._func_name(), args)
|
||||||
|
output.extend(ucs_output or [])
|
||||||
|
output.extend(nexus_output or [])
|
||||||
|
return output
|
||||||
|
|
||||||
def get_all_ports(self, args):
|
def get_all_ports(self, args):
|
||||||
"""Not implemented for this model"""
|
"""Not implemented for this model"""
|
||||||
|
@ -140,13 +148,13 @@ class L2NetworkMultiBlade(L2NetworkModelBase):
|
||||||
|
|
||||||
def create_port(self, args):
|
def create_port(self, args):
|
||||||
"""Support for the Quantum core API call"""
|
"""Support for the Quantum core API call"""
|
||||||
self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),
|
return self._invoke_plugin_per_device(const.UCS_PLUGIN,
|
||||||
args)
|
self._func_name(), args)
|
||||||
|
|
||||||
def delete_port(self, args):
|
def delete_port(self, args):
|
||||||
"""Support for the Quantum core API call"""
|
"""Support for the Quantum core API call"""
|
||||||
self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),
|
return self._invoke_plugin_per_device(const.UCS_PLUGIN,
|
||||||
args)
|
self._func_name(), args)
|
||||||
|
|
||||||
def update_port(self, args):
|
def update_port(self, args):
|
||||||
"""Not implemented for this model"""
|
"""Not implemented for this model"""
|
||||||
|
@ -158,13 +166,13 @@ class L2NetworkMultiBlade(L2NetworkModelBase):
|
||||||
|
|
||||||
def plug_interface(self, args):
|
def plug_interface(self, args):
|
||||||
"""Support for the Quantum core API call"""
|
"""Support for the Quantum core API call"""
|
||||||
self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),
|
return self._invoke_plugin_per_device(const.UCS_PLUGIN,
|
||||||
args)
|
self._func_name(), args)
|
||||||
|
|
||||||
def unplug_interface(self, args):
|
def unplug_interface(self, args):
|
||||||
"""Support for the Quantum core API call"""
|
"""Support for the Quantum core API call"""
|
||||||
self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),
|
return self._invoke_plugin_per_device(const.UCS_PLUGIN,
|
||||||
args)
|
self._func_name(), args)
|
||||||
|
|
||||||
def schedule_host(self, args):
|
def schedule_host(self, args):
|
||||||
"""Provides the hostname on which a dynamic vnic is reserved"""
|
"""Provides the hostname on which a dynamic vnic is reserved"""
|
||||||
|
|
|
@ -80,8 +80,6 @@ class Test_L2NetworkMultiBlade(unittest.TestCase):
|
||||||
|
|
||||||
self.ucs_count = self._inventory['ucs_plugin'].\
|
self.ucs_count = self._inventory['ucs_plugin'].\
|
||||||
_inventory.__len__()
|
_inventory.__len__()
|
||||||
print 'asdfasdfasdfasdfasdf'
|
|
||||||
print self._inventory['ucs_plugin']._inventory
|
|
||||||
|
|
||||||
def test_create_network(self):
|
def test_create_network(self):
|
||||||
"""Support for the Quantum core API call"""
|
"""Support for the Quantum core API call"""
|
||||||
|
@ -113,17 +111,14 @@ class Test_L2NetworkMultiBlade(unittest.TestCase):
|
||||||
self.net_id,
|
self.net_id,
|
||||||
self.vlan_name,
|
self.vlan_name,
|
||||||
self.vlan_id])
|
self.vlan_id])
|
||||||
self._l2network_multiblade.delete_network([self.tenant_id,
|
networks = self._l2network_multiblade.delete_network([self.tenant_id,
|
||||||
self.net_id])
|
self.net_id])
|
||||||
device_params = self._l2network_multiblade._invoke_inventory(
|
|
||||||
self.plugin_key,
|
self.assertEqual(networks.__len__(), self.ucs_count)
|
||||||
self._l2network_multiblade.delete_network,
|
|
||||||
[self.tenant_id,
|
for network in networks:
|
||||||
self.net_id])
|
self.assertEqual(network[const.NET_ID], self.net_id)
|
||||||
device_ips = device_params[const.DEVICE_IP]
|
self.assertEqual(network[const.NET_NAME], self.net_name)
|
||||||
for device_ip in device_ips:
|
|
||||||
new_device_params[const.DEVICE_IP] = device_ip
|
|
||||||
self.assertEqual(test_device_ip ,new_device_params[const.DEVICE_IP])
|
|
||||||
LOG.debug("test_delete_network - END")
|
LOG.debug("test_delete_network - END")
|
||||||
|
|
||||||
def test_delete_networkDNE(self):
|
def test_delete_networkDNE(self):
|
||||||
|
@ -142,21 +137,15 @@ class Test_L2NetworkMultiBlade(unittest.TestCase):
|
||||||
self.net_id,
|
self.net_id,
|
||||||
self.vlan_name,
|
self.vlan_name,
|
||||||
self.vlan_id])
|
self.vlan_id])
|
||||||
self._l2network_multiblade.rename_network([self.tenant_id,
|
networks = self._l2network_multiblade.rename_network([self.tenant_id,
|
||||||
self.net_id,
|
self.net_id,
|
||||||
self.new_net_name])
|
self.new_net_name])
|
||||||
device_params = self._l2network_multiblade._invoke_inventory(
|
|
||||||
self.plugin_key,
|
|
||||||
self._l2network_multiblade.rename_network,
|
|
||||||
[self.tenant_id,
|
|
||||||
self.net_id,
|
|
||||||
self.new_net_name])
|
|
||||||
|
|
||||||
device_ips = device_params[const.DEVICE_IP]
|
self.assertEqual(networks.__len__(), self.ucs_count)
|
||||||
for device_ip in device_ips:
|
|
||||||
new_device_params[const.DEVICE_IP] = device_ip
|
for network in networks:
|
||||||
self.assertEqual(test_device_ip ,
|
self.assertEqual(network[const.NET_ID], self.net_id)
|
||||||
new_device_params[const.DEVICE_IP])
|
self.assertEqual(network[const.NET_NAME], self.net_name)
|
||||||
self.tearDownNetwork(self.tenant_id, self.net_id)
|
self.tearDownNetwork(self.tenant_id, self.net_id)
|
||||||
LOG.debug("test_rename_network - END")
|
LOG.debug("test_rename_network - END")
|
||||||
|
|
||||||
|
@ -177,24 +166,17 @@ class Test_L2NetworkMultiBlade(unittest.TestCase):
|
||||||
LOG.debug("test_create_port - START")
|
LOG.debug("test_create_port - START")
|
||||||
port = db.port_create(self.net_id, self.port_state)
|
port = db.port_create(self.net_id, self.port_state)
|
||||||
port_id= port[const.UUID]
|
port_id= port[const.UUID]
|
||||||
self._l2network_multiblade.create_port([self.tenant_id,
|
ports = self._l2network_multiblade.create_port([self.tenant_id,
|
||||||
self.net_id,
|
self.net_id,
|
||||||
self.port_state,
|
self.port_state,
|
||||||
port_id])
|
port_id])
|
||||||
device_params = self._l2network_multiblade._invoke_inventory(
|
print 'asdfasdfasdfasdfasdfasdfasdfasdf'
|
||||||
self.plugin_key,
|
print ports
|
||||||
self._l2network_multiblade.create_port,
|
#self.assertEqual(networks.__len__(), self.ucs_count)
|
||||||
[self.tenant_id,
|
|
||||||
self.net_id,
|
#for network in networks:
|
||||||
self.port_state,
|
# self.assertEqual(network[const.NET_ID], self.net_id)
|
||||||
self.port_id])
|
# self.assertEqual(network[const.NET_NAME], self.net_name)
|
||||||
device_ips = device_params[const.DEVICE_IP]
|
|
||||||
print device_params
|
|
||||||
print "asdfasdfasdfasdf"
|
|
||||||
for device_ip in device_ips:
|
|
||||||
new_device_params[const.DEVICE_IP] = device_ip
|
|
||||||
self.assertEqual(self.test_device_ip,
|
|
||||||
new_device_params[const.DEVICE_IP])
|
|
||||||
self.tearDownNetwork(self.tenant_id, self.net_id)
|
self.tearDownNetwork(self.tenant_id, self.net_id)
|
||||||
LOG.debug("test_create_network - END")
|
LOG.debug("test_create_network - END")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue