25164260 Some Solaris commands used in neutron need to be re-arranged
authorVardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
Tue, 29 Nov 2016 14:39:33 -0800
changeset 7404 afd5ce53bbf1
parent 7403 dc947d165222
child 7408 a8982bb719b4
25164260 Some Solaris commands used in neutron need to be re-arranged
components/openstack/neutron/files/agent/solaris/net_lib.py
--- a/components/openstack/neutron/files/agent/solaris/net_lib.py	Tue Nov 29 14:43:02 2016 -0800
+++ b/components/openstack/neutron/files/agent/solaris/net_lib.py	Tue Nov 29 14:39:33 2016 -0800
@@ -86,7 +86,7 @@
             # create ip interface
             cmd = ['/usr/sbin/ipadm', 'create-ip', self._ifname]
             if temp:
-                cmd.append('-t')
+                cmd.insert(2, '-t')
             self.execute_with_pfexec(cmd)
         elif addrcheck and self.ipaddr_exists(ipaddr, self._ifname):
             return
@@ -107,13 +107,13 @@
                 cmd = ['/usr/sbin/ipadm', 'create-addr', '-T', 'static', '-a',
                        str(ll_addr), self._ifname]
                 if temp:
-                    cmd.append('-t')
+                    cmd.insert(2, '-t')
                 self.execute_with_pfexec(cmd)
 
         cmd = ['/usr/sbin/ipadm', 'create-addr', '-T', 'static', '-a',
                ipaddr, self._ifname]
         if temp:
-            cmd.append('-t')
+            cmd.insert(2, '-t')
 
         self.execute_with_pfexec(cmd)
 
@@ -122,7 +122,7 @@
             # create ip interface
             cmd = ['/usr/sbin/ipadm', 'create-ip', self._ifname]
             if temp:
-                cmd.append('-t')
+                cmd.insert(2, '-t')
             self.execute_with_pfexec(cmd)
         else:
             cmd = ['/usr/sbin/ipadm', 'show-addr', '-po', 'type', self._ifname]
@@ -133,7 +133,7 @@
         cmd = ['/usr/sbin/ipadm', 'create-addr', '-T', 'addrconf',
                self._ifname]
         if temp:
-            cmd.append('-t')
+            cmd.insert(2, '-t')
         self.execute_with_pfexec(cmd)
 
     def delete_address(self, ipaddr, addrcheck=True):
@@ -199,7 +199,7 @@
         cmd = ['/usr/sbin/dladm', 'create-vnic', '-l', lower_link,
                '-m', mac_address, '-v', vid, self._dlname]
         if temp:
-            cmd.append('-t')
+            cmd.insert(2, '-t')
 
         self.execute_with_pfexec(cmd)
 
@@ -207,7 +207,7 @@
         cmd = ['/usr/sbin/dladm', 'set-linkprop', '-p', '%s=%s'
                % (pname, pvalue), self._dlname]
         if temp:
-            cmd.append('-t')
+            cmd.insert(2, '-t')
         self.execute_with_pfexec(cmd)
 
     def delete_vnic(self):