Tweaking other multiblade tests.

diff --git a/quantum/plugins/cisco/models/l2network_multi_blade.py b/quantum/plugins/cisco/models/l2network_multi_blade.py
index dfebd9069bd5c63f8715ecc9d8b3c6ecf550c941..0f77e44d3f7a2de797c05b971980a152e5fb69fe 100644 (file)
--- a/quantum/plugins/cisco/models/l2network_multi_blade.py
+++ b/quantum/plugins/cisco/models/l2network_multi_blade.py
@@ -118,10 +118,14 @@ class L2NetworkMultiBlade(L2NetworkModelBase):
 
     def delete_network(self, args):
         """Support for the Quantum core API call"""
-        self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),
-                                       args)
-        self._invoke_plugin_per_device(const.NEXUS_PLUGIN,
+        output = []
+        ucs_output = self._invoke_plugin_per_device(const.UCS_PLUGIN,
+                                       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):
         """Not implemented for this model"""
@@ -129,10 +133,14 @@ class L2NetworkMultiBlade(L2NetworkModelBase):
 
     def rename_network(self, args):
         """Support for the Quantum core API call"""
-        self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),
-                                       args)
-        self._invoke_plugin_per_device(const.NEXUS_PLUGIN,
+        output = []
+        ucs_output = self._invoke_plugin_per_device(const.UCS_PLUGIN,
+                                       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):
         """Not implemented for this model"""
@@ -140,13 +148,13 @@ class L2NetworkMultiBlade(L2NetworkModelBase):
 
     def create_port(self, args):
         """Support for the Quantum core API call"""
-        self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),
-                                       args)
+        return self._invoke_plugin_per_device(const.UCS_PLUGIN,
+                                       self._func_name(), args)
 
     def delete_port(self, args):
         """Support for the Quantum core API call"""
-        self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),
-                                       args)
+        return self._invoke_plugin_per_device(const.UCS_PLUGIN,
+                                        self._func_name(), args)
 
     def update_port(self, args):
         """Not implemented for this model"""
@@ -158,13 +166,13 @@ class L2NetworkMultiBlade(L2NetworkModelBase):
 
     def plug_interface(self, args):
         """Support for the Quantum core API call"""
-        self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),
-                                       args)
+        return self._invoke_plugin_per_device(const.UCS_PLUGIN,
+                                        self._func_name(), args)
 
     def unplug_interface(self, args):
         """Support for the Quantum core API call"""
-        self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),
-                                       args)
+        return self._invoke_plugin_per_device(const.UCS_PLUGIN,
+                                        self._func_name(), args)
 
     def schedule_host(self, args):
         """Provides the hostname on which a dynamic vnic is reserved"""

diff --git a/quantum/plugins/cisco/tests/unit/test_l2network_multi_blade.py b/quantum/plugins/cisco/tests/unit/test_l2network_multi_blade.py
index 6a594118b1f9f142ce3c92af6ddf8d9e4f184cd7..d02d0c9c5e03ac41fcae3671c1badd84e1e1bcd0 100644 (file)
--- a/quantum/plugins/cisco/tests/unit/test_l2network_multi_blade.py
+++ b/quantum/plugins/cisco/tests/unit/test_l2network_multi_blade.py
@@ -80,8 +80,6 @@ class Test_L2NetworkMultiBlade(unittest.TestCase):
 
         self.ucs_count = self._inventory['ucs_plugin'].\
                              _inventory.__len__()
-        print 'asdfasdfasdfasdfasdf'
-        print self._inventory['ucs_plugin']._inventory
       
     def test_create_network(self):
         """Support for the Quantum core API call"""
@@ -113,17 +111,14 @@ class Test_L2NetworkMultiBlade(unittest.TestCase):
                                                    self.net_id,
                                                    self.vlan_name,
                                                    self.vlan_id])
-        self._l2network_multiblade.delete_network([self.tenant_id,
+        networks = self._l2network_multiblade.delete_network([self.tenant_id,
                                                    self.net_id])
-        device_params = self._l2network_multiblade._invoke_inventory(
-                                self.plugin_key,
-                                self._l2network_multiblade.delete_network,
-                                [self.tenant_id,
-                                self.net_id])
-        device_ips = device_params[const.DEVICE_IP]
-        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])
+
+        self.assertEqual(networks.__len__(), self.ucs_count)
+        
+        for network in networks:
+            self.assertEqual(network[const.NET_ID], self.net_id)
+            self.assertEqual(network[const.NET_NAME], self.net_name)
            LOG.debug("test_delete_network - END")
 
     def test_delete_networkDNE(self):
@@ -142,21 +137,15 @@ class Test_L2NetworkMultiBlade(unittest.TestCase):
                                                    self.net_id,
                                                    self.vlan_name,
                                                    self.vlan_id])
-        self._l2network_multiblade.rename_network([self.tenant_id,
+        networks = self._l2network_multiblade.rename_network([self.tenant_id,
                                                    self.net_id,
                                                    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]
-        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])
+
+        self.assertEqual(networks.__len__(), self.ucs_count)
+        
+        for network in networks:
+            self.assertEqual(network[const.NET_ID], self.net_id)
+            self.assertEqual(network[const.NET_NAME], self.net_name)
         self.tearDownNetwork(self.tenant_id, self.net_id)
         LOG.debug("test_rename_network - END")
 
@@ -177,24 +166,17 @@ class Test_L2NetworkMultiBlade(unittest.TestCase):
         LOG.debug("test_create_port - START")
         port = db.port_create(self.net_id, self.port_state)
         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.port_state,
                                                    port_id])
-        device_params = self._l2network_multiblade._invoke_inventory(
-                              self.plugin_key,
-                              self._l2network_multiblade.create_port,
-                              [self.tenant_id,
-                              self.net_id,
-                              self.port_state,
-                              self.port_id])
-        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])
+        print 'asdfasdfasdfasdfasdfasdfasdfasdf'
+        print ports
+        #self.assertEqual(networks.__len__(), self.ucs_count)
+        
+        #for network in networks:
+        #    self.assertEqual(network[const.NET_ID], self.net_id)
+        #    self.assertEqual(network[const.NET_NAME], self.net_name)
         self.tearDownNetwork(self.tenant_id, self.net_id)
         LOG.debug("test_create_network - END")