Forward merge apache/4.13 to master

4.13 forward merge

Author: yadvr

core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetNetworkAclConfigItem.java

@@ -79,7 +79,7 @@ public List<ConfigItem> generateConfig(final NetworkElementCommand cmd) {
                 // If we check the size of the array, it will fail to setup the network.
                 // So, let's catch the exception and continue in the loop.
                 try {
-                    aclRule = new ProtocolAclRule(ruleParts[5], false, Integer.parseInt(ruleParts[1]));
+                    aclRule = new ProtocolAclRule(ruleParts[4], "ACCEPT".equals(ruleParts[5]), Integer.parseInt(ruleParts[1]));
                 } catch (final Exception e) {
                     s_logger.warn("Problem occured when reading the entries in the ruleParts array. Actual array size is '" + ruleParts.length + "', but trying to read from index 5.");
                     continue;
@@ -104,4 +104,4 @@ protected List<ConfigItem> generateConfigItems(final ConfigBase configuration) {
 
         return super.generateConfigItems(configuration);
     }
-}
+}

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

@@ -3665,7 +3665,7 @@ public boolean configureNetworkRulesVMSecondaryIP(final Connect conn, final Stri
         cmd.add("network_rules_vmSecondaryIp");
         cmd.add("--vmname", vmName);
         cmd.add("--nicsecips", secIp);
-        cmd.add("--action", action);
+        cmd.add("--action=" + action);
 
         final String result = cmd.execute();
         if (result != null) {

server/src/main/java/com/cloud/network/NetworkServiceImpl.java

@@ -732,11 +732,10 @@ public NicSecondaryIp allocateSecondaryGuestIP(final long nicId, IpAddresses req
             }
 
             try {
-                if (ipv4Address != null) {
-                    ipaddr = _ipAddrMgr.allocatePublicIpForGuestNic(network, podId, ipOwner, ipv4Address);
-                }
                 if (ipv6Address != null) {
                     ip6addr = ipv6AddrMgr.allocatePublicIp6ForGuestNic(network, podId, ipOwner, ipv6Address);
+                } else {
+                    ipaddr = _ipAddrMgr.allocatePublicIpForGuestNic(network, podId, ipOwner, ipv4Address);
                 }
                 if (ipaddr == null && ipv6Address == null) {
                     throw new InvalidParameterValueException("Allocating ip to guest nic " + nicId + " failed");