CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest network configured on the eth device

rajesh-battala · rajesh-battala · commit 6cbb9a5b722b · 2014-05-05T12:56:42.000+05:30
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -780,8 +780,14 @@ protected List<ConfigItem> generateConfig(SetupGuestNetworkCommand cmd) {
 
         String dev = "eth" + nic.getDeviceId();
         String netmask = NetUtils.getSubNet(routerGIP, nic.getNetmask());
-
-        String args = " -C";
+        String args = "";
+        if(cmd.isAdd() == false) {
+            //pass the argument to script to delete the network
+            args +=" -D ";
+        } else {
+            // pass create option argument if the ip needs to be added to eth device
+            args +=" -C ";
+        }
         args += " -M " + nic.getMac();
         args += " -d " + dev;
         args += " -i " + routerGIP;
