Including the fix from 1706 since the merge conflict is complicated

Author: swill

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

@@ -64,6 +64,10 @@ def merge(dbag, rules):
                             print "removing index %s" % str(index)
                     if not index == -1:
                         del dbag[source_ip][index]
+                        # If all forwarding rules have been deleted
+                        # remove IP from databag
+                        if dbag[source_ip] == []:
+                            del dbag[source_ip]
 
     return dbag
 

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

@@ -45,9 +45,13 @@ def merge(dbag, ip):
     if ip['nw_type'] == 'control':
         dbag[ip['device']] = [ip]
     else:
-        if index != -1:
-            dbag[ip['device']][index] = ip
+        if ip['add']:
+            if index != -1:
+                dbag[ip['device']][index] = ip
+            else:
+                dbag.setdefault(ip['device'], []).append(ip)
         else:
-            dbag.setdefault(ip['device'], []).append(ip)
+            if index != -1:
+                del(dbag[ip['device']][index])
 
     return dbag