Multiple networks support: use defined separator

Author: ustcweizhou

core/src/main/java/com/cloud/agent/api/SecurityGroupRulesCmd.java

@@ -35,8 +35,8 @@
 
 public class SecurityGroupRulesCmd extends Command {
     private static final String CIDR_LENGTH_SEPARATOR = "/";
-    private static final char RULE_TARGET_SEPARATOR = ',';
-    private static final char RULE_COMMAND_SEPARATOR = ';';
+    public static final char RULE_TARGET_SEPARATOR = ',';
+    public static final char RULE_COMMAND_SEPARATOR = ';';
     protected static final String EGRESS_RULE = "E:";
     protected static final String INGRESS_RULE = "I:";
     private static final Logger LOGGER = Logger.getLogger(SecurityGroupRulesCmd.class);

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -106,6 +106,7 @@
 import com.cloud.agent.resource.virtualnetwork.VRScripts;
 import com.cloud.agent.resource.virtualnetwork.VirtualRouterDeployer;
 import com.cloud.agent.resource.virtualnetwork.VirtualRoutingResource;
+import com.cloud.agent.api.SecurityGroupRulesCmd;
 import com.cloud.dc.Vlan;
 import com.cloud.exception.InternalErrorException;
 import com.cloud.host.Host.Type;
@@ -3562,11 +3563,11 @@ public boolean destroyNetworkRulesForNic(final Connect conn, final String vmName
         final StringBuilder sb = new StringBuilder();
         if (nicSecIps != null) {
             for (final String ip : nicSecIps) {
-                sb.append(ip).append(";");
+                sb.append(ip).append(SecurityGroupRulesCmd.RULE_COMMAND_SEPARATOR);
             }
             secIpsStr = sb.toString();
         } else {
-            secIpsStr = "0;";
+            secIpsStr = "0" + SecurityGroupRulesCmd.RULE_COMMAND_SEPARATOR;
         }
         final List<InterfaceDef> intfs = getInterfaces(conn, vmName);
         if (intfs.size() == 0 || intfs.size() < nic.getDeviceId()) {
@@ -3645,11 +3646,11 @@ public boolean applyDefaultNetworkRulesOnNic(final Connect conn, final String vm
         final StringBuilder sb = new StringBuilder();
         if (nicSecIps != null) {
             for (final String ip : nicSecIps) {
-                sb.append(ip).append(";");
+                sb.append(ip).append(SecurityGroupRulesCmd.RULE_COMMAND_SEPARATOR);
             }
             secIpsStr = sb.toString();
         } else {
-            secIpsStr = "0;";
+            secIpsStr = "0" + SecurityGroupRulesCmd.RULE_COMMAND_SEPARATOR;
         }
         return defaultNetworkRules(conn, vmName, nic, vmId, secIpsStr, isFirstNic, checkBeforeApply);
     }

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPlugNicCommandWrapper.java

@@ -29,6 +29,7 @@
 import com.cloud.hypervisor.kvm.resource.VifDriver;
 import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
+import com.cloud.vm.VirtualMachine;
 import org.apache.log4j.Logger;
 import org.libvirt.Connect;
 import org.libvirt.Domain;
@@ -45,6 +46,7 @@ public final class LibvirtPlugNicCommandWrapper extends CommandWrapper<PlugNicCo
     public Answer execute(final PlugNicCommand command, final LibvirtComputingResource libvirtComputingResource) {
         final NicTO nic = command.getNic();
         final String vmName = command.getVmName();
+        final VirtualMachine.Type vmType = command.getVMType();
         Domain vm = null;
         try {
             final LibvirtUtilitiesHelper libvirtUtilitiesHelper = libvirtComputingResource.getLibvirtUtilitiesHelper();
@@ -65,7 +67,7 @@ public Answer execute(final PlugNicCommand command, final LibvirtComputingResour
             vm.attachDevice(interfaceDef.toString());
 
             // apply default network rules on new nic
-            if (vmName.startsWith("i-") && nic.isSecurityGroupEnabled()) {
+            if (vmType == VirtualMachine.Type.User && nic.isSecurityGroupEnabled()) {
                 final Long vmId = Long.valueOf(vmName.split("-")[2]);
                 libvirtComputingResource.applyDefaultNetworkRulesOnNic(conn, vmName, vmId, nic, false, false);
             }