relax KVM agent setup to allow non-bridge traffic labels

Marcus Sorensen · Marcus Sorensen · commit c2e2f6ce633e · 2013-11-01T18:16:54.000-06:00
(guest bridges are created on physical device, no need for bridge traffic label)
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1055,7 +1055,7 @@ private String matchPifFileInDirectory(String bridgeName){
             String fname = interfaces[i].getName();
             s_logger.debug("matchPifFileInDirectory: file name '"+fname+"'");
             if (fname.startsWith("eth") || fname.startsWith("bond")
-                || fname.startsWith("vlan") || fname.startsWith("em")
+                || fname.startsWith("vlan") || fname.startsWith("vxlan") || fname.startsWith("em")
                 || fname.matches("^p\\d+p\\d+.*")) {
                 return fname;
             }
diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py
@@ -96,8 +96,9 @@ def isPreConfiged(self):
                 return False
             if self.syscfg.env.bridgeType == "openvswitch" and not self.netcfg.isOvsBridge(br):
                 raise CloudInternalException("%s is not an openvswitch bridge" % br)
-            if self.syscfg.env.bridgeType == "native" and not self.netcfg.isBridge(br):
-                raise CloudInternalException("%s is not a bridge" % br)
+            if self.syscfg.env.bridgeType == "native" and not self.netcfg.isBridge(br) and not self.netcfg.isNetworkDev(br):
+                # traffic label doesn't have to be a bridge, we'll create bridges on it
+                raise CloudInternalException("%s is not a bridge and not a net device" % br)
             preCfged = True
 
         return preCfged

Original file line number	Diff line number	Diff line change
`@@ -1055,7 +1055,7 @@ private String matchPifFileInDirectory(String bridgeName){`
`1055`	`1055`	`String fname = interfaces[i].getName();`
`1056`	`1056`	`s_logger.debug("matchPifFileInDirectory: file name '"+fname+"'");`
`1057`	`1057`	`if (fname.startsWith("eth") \|\| fname.startsWith("bond")`
`1058`		`- \|\| fname.startsWith("vlan") \|\| fname.startsWith("em")`
	`1058`	`+ \|\| fname.startsWith("vlan") \|\| fname.startsWith("vxlan") \|\| fname.startsWith("em")`
`1059`	`1059`	`\|\| fname.matches("^p\\d+p\\d+.*")) {`
`1060`	`1060`	`return fname;`
`1061`	`1061`	`}`