From a0373fe1ff2001c5a9deee537d6862327f8818cc Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <trippie@gmail.com>
Date: Mon, 21 Jan 2013 12:34:20 +0100
Subject: [PATCH] Summary: Apply feedback from Wido

Better checking on VlanID

Correct speling mistake
---
 .../com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java    | 4 ++--
 .../src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java   | 2 +-
 .../src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
index bde4da268b6..b897df2ecf3 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -176,7 +176,7 @@ public class BridgeVifDriver extends VifDriverBase {
         createControlNetwork(_bridges.get("linklocal"));
     }
 
-    private void deletExitingLinkLocalRoutTable(String linkLocalBr) {
+    private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
         Script command = new Script("/bin/bash", _timeout);
         command.add("-c");
         command.add("ip route | grep " + NetUtils.getLinkLocalCIDR());
@@ -201,7 +201,7 @@ public class BridgeVifDriver extends VifDriverBase {
     }
 
     private void createControlNetwork(String privBrName) {
-        deletExitingLinkLocalRoutTable(privBrName);
+        deleteExitingLinkLocalRouteTable(privBrName);
         if (!isBridgeExists(privBrName)) {
             Script.runSimpleBashScript("brctl addbr " + privBrName + "; ifconfig " + privBrName + " up; ifconfig " +
                     privBrName + " 169.254.0.1", _timeout);
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index c02d8fc175a..acfd9cf1fe8 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -748,7 +748,7 @@ public class LibvirtVMDef {
                 }
                 netBuilder.append("</virtualport>\n");
             }
-            if (_vlanTag != -1) {
+            if (_vlanTag > 0 && _vlanTag < 4095) {
                 netBuilder.append("<vlan trunk='no'>\n<tag id='" + _vlanTag + "'/>\n</vlan>");
             }
             netBuilder.append("</interface>\n");
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
index 04c29a856e0..37761aa5555 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
@@ -143,7 +143,7 @@ public class OvsVifDriver extends VifDriverBase {
         return brName;
     }
     
-    private void deleteExitingLinkLocalRoutTable(String linkLocalBr) {
+    private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
         Script command = new Script("/bin/bash", _timeout);
         command.add("-c");
         command.add("ip route | grep " + NetUtils.getLinkLocalCIDR());
@@ -168,7 +168,7 @@ public class OvsVifDriver extends VifDriverBase {
     }
 
     private void createControlNetwork(String privBrName) {
-        deleteExitingLinkLocalRoutTable(privBrName);
+        deleteExitingLinkLocalRouteTable(privBrName);
         if (!isBridgeExists(privBrName)) {
             Script.runSimpleBashScript("ovs-vsctl add-br " + privBrName + "; ifconfig " + privBrName + " up; ifconfig " +
                     privBrName + " 169.254.0.1", _timeout);