Merge lp:~emagana/neutron/plugin-framework-nxos into lp:~cisco-openstack/neutron/plugin-framework

[Edgar Magana]

Fixing the issue removing the configuration for the Nexus Port Interface assigned.

[Sumit Naiksatam (snaiksat)]

lgtm

review: Approve

=== modified file 'quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py'
--- quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py	2011-08-01 19:40:07 +0000
+++ quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py	2011-08-03 20:33:36 +0000
@@ -193,6 +193,12 @@
         print confstr
         mgr.edit_config(target='running', config=confstr)
 
+    def disable_switch_port(self, mgr, interface):
+        confstr = cmd_no_switchport % (interface)
+        confstr = exec_conf_prefix + confstr + exec_conf_postfix
+        print confstr
+        mgr.edit_config(target='running', config=confstr)
+
     def enable_vlan_on_trunk_int(self, mgr, interface, vlanid):
         confstr = cmd_vlan_int_snippet % (interface, vlanid)
         confstr = exec_conf_prefix + confstr + exec_conf_postfix
@@ -221,12 +227,14 @@
         with self.nxos_connect(nexus_host, 22, nexus_user,
                                nexus_password) as m:
             self.enable_vlan(m, vlan_id, vlan_name)
-            self.enable_port_trunk(m, nexus_interface)
+            self.enable_vlan_on_trunk_int(m, nexus_interface, vlan_id)
 
-    def delete_vlan(self, vlan_id, nexus_host, nexus_user, nexus_password):
+    def delete_vlan(self, vlan_id, nexus_host, nexus_user,
+                    nexus_password, nexus_interface):
         with self.nxos_connect(nexus_host, 22, nexus_user,
                                nexus_password) as m:
             self.disable_vlan(m, vlan_id)
+            self.disable_switch_port(m, nexus_interface)
 
 
 def main():
 
=== modified file 'quantum/plugins/cisco/nexus/cisco_nexus_plugin.py'
--- quantum/plugins/cisco/nexus/cisco_nexus_plugin.py	2011-08-02 01:32:25 +0000
+++ quantum/plugins/cisco/nexus/cisco_nexus_plugin.py	2011-08-03 20:33:36 +0000
@@ -79,7 +79,7 @@
         vlan_id = self._get_vlan_id_for_network(tenant_id, net_id)
         if net:
             self._client.delete_vlan(str(vlan_id), self._nexus_ip,
-                self._nexus_username, self._nexus_password)
+                self._nexus_username, self._nexus_password, self._nexus_port)
             self._networks.pop(net_id)
             return net
         # Network not found