VR interfaces need the proper network type in ips

Author: spark404

systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py

@@ -86,7 +86,7 @@ def process(self):
     def add_netstats(self, address):
         # add in the network stats iptables rules
         dev = "eth%s" % address['nic_dev_id']
-        if address["nw_type"] == "public_ip":
+        if address["nw_type"] == "public":
             self.fw.append(["", "front", "-A FORWARD -j NETWORK_STATS"])
             self.fw.append(["", "front", "-A INPUT -j NETWORK_STATS"])
             self.fw.append(["", "front", "-A OUTPUT -j NETWORK_STATS"])

systemvm/patches/debian/config/opt/cloud/bin/merge.py

@@ -141,12 +141,15 @@ def processCL(self, dbag):
         # "eth0ip": "192.168.56.32",
         # "eth0mask": "255.255.255.0",
         self.newData = []
-        self.processCLItem('0')
-        self.processCLItem('1')
-        self.processCLItem('2')
+        if (self.qFile.data['cmd_line']['type'] == "router"):
+            self.processCLItem('0', "guest")
+            self.processCLItem('1', "control")
+            self.processCLItem('2', "public")
+        elif (self.qFile.data['cmd_line']['type'] == "vpcrouter"):
+            self.processCLItem('0', "control")
         return cs_cmdline.merge(dbag, self.qFile.data)
 
-    def processCLItem(self, num):
+    def processCLItem(self, num, nw_type):
         key = 'eth' + num + 'ip'
         dp  = {}
         if(key in self.qFile.data['cmd_line']):
@@ -160,7 +163,7 @@ def processCLItem(self, num):
            else:
                dp['gateway'] = 'None'
            dp['nic_dev_id'] = num
-           dp['nw_type']    = 'control'
+           dp['nw_type']    = nw_type
            qf = loadQueueFile()
            qf.load({ 'ip_address' : [ dp ], 'type' : 'ips'})