Dont assume vlan tag of control+data interface would be same across a…

…ll nodes

Closes-Bug: #1456144

Change-Id: I303970b0d8fbb38fe3d64a9f038821cd5fd696da

fabfile/tasks/provision.py

@@ -2189,7 +2189,7 @@ def add_static_route_node(*args):
         dest = ' --network'; gw = ' --gw'; netmask = ' --netmask'
         device = route_info[tgt_host][0]['intf']
         intf = ' --device %s' %device
-        vlan = get_vlan_tag(device)
+        vlan = get_vlan_tag(device, tgt_host)
         for index in range(len(route_info[tgt_host])):
             dest += ' %s' %route_info[tgt_host][index]['ip']
             gw += ' %s' %route_info[tgt_host][index]['gw']

fabfile/utils/interface.py

@@ -47,10 +47,9 @@ def get_data_ip(host_str):
     return (tgt_ip, tgt_gw)
 #end get_data_ip
 
-def get_vlan_tag(device):
+def get_vlan_tag(device, host):
     hosts = getattr(testbed, 'control_data', None)
-    if hosts:
-        for host in hosts.keys():
-            if hosts[host]['device'] == device and hosts[host].has_key('vlan'):
-                return hosts[host]['vlan']
+    if hosts and host in hosts:
+        if hosts[host]['device'] == device and hosts[host].has_key('vlan'):
+            return hosts[host]['vlan']
     return None