Closes-Bug: #1522202, Not able to re-image from Server manager when m…

…ember interfaces are not defined Change-Id: Id529478b2fcb42f06a29881a596fd8ce4bcd4638
Juniper · Dec 8, 2015 · cb56821 · cb56821
1 parent 2a531a4
commit cb56821
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/server_mgr_main.py b/src/server_mgr_main.py
@@ -2764,10 +2764,8 @@ def build_server_cfg(self, server):
             network_dict = eval(network)
             mgmt_intf = network_dict['management_interface']
             interface_list = network_dict["interfaces"]
-            i = 0
             device_str = "#!/bin/bash\n"
             for intf in interface_list:
-                i += 1
                 name = intf['name']
                 ip_addr = intf.get('ip_address', None)
                 if ip_addr is None:
@@ -2781,14 +2779,12 @@ def build_server_cfg(self, server):
                 #form string
                 if type and type.lower() == 'bond':
                     bond_opts = intf.get('bond_options', {})
-                    member_intfs = intf.get('member_interfaces', [])
-                    if member_intfs:
-                        mem_intfs = self.get_member_interfaces(network_dict,
-                                                               member_intfs)
+                    member_intfs = self.get_member_interfaces(network_dict,
+                                                              intf.get('member_interfaces', []))
                     device_str+= ("python interface_setup.py \
 --device %s --members %s --bond-opts \"%s\" --ip %s --no-restart-network\n") % \
                         (name,
-            			" ".join(mem_intfs),
+            			" ".join(member_intfs),
 			            json.dumps(bond_opts), ip_addr)
                     execute_script = True
                 else: