Merge branch '4.19' into 4.20

Author: DaanHoogland

api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java

@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
 
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
@@ -40,6 +41,7 @@
 import com.cloud.network.IpAddress;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.user.Account;
+import com.cloud.utils.StringUtils;
 import com.cloud.utils.net.NetUtils;
 
 @APICommand(name = "createFirewallRule", description = "Creates a firewall rule for a given IP address", responseObject = FirewallResponse.class, entityType = {FirewallRule.class},
@@ -125,14 +127,13 @@ public void setPublicEndPort(Integer publicEndPort) {
 
     @Override
     public List<String> getSourceCidrList() {
-        if (cidrlist != null) {
+        if (CollectionUtils.isNotEmpty(cidrlist) && !(cidrlist.size() == 1 && StringUtils.isBlank(cidrlist.get(0)))) {
             return cidrlist;
         } else {
-            List<String> oneCidrList = new ArrayList<String>();
+            List<String> oneCidrList = new ArrayList<>();
             oneCidrList.add(NetUtils.ALL_IP4_CIDRS);
             return oneCidrList;
         }
-
     }
 
     // ///////////////////////////////////////////////////

api/src/test/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmdTest.java

@@ -0,0 +1,91 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.firewall;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.cloud.utils.net.NetUtils;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CreateFirewallRuleCmdTest {
+
+    private void validateAllIp4Cidr(final CreateFirewallRuleCmd cmd) {
+        Assert.assertTrue(CollectionUtils.isNotEmpty(cmd.getSourceCidrList()));
+        Assert.assertEquals(1, cmd.getSourceCidrList().size());
+        Assert.assertEquals(NetUtils.ALL_IP4_CIDRS, cmd.getSourceCidrList().get(0));
+    }
+
+    @Test
+    public void testGetSourceCidrList_Null() {
+        final CreateFirewallRuleCmd cmd = new CreateFirewallRuleCmd();
+        ReflectionTestUtils.setField(cmd, "cidrlist", null);
+        validateAllIp4Cidr(cmd);
+    }
+
+    @Test
+    public void testGetSourceCidrList_Empty() {
+        final CreateFirewallRuleCmd cmd = new CreateFirewallRuleCmd();
+        ReflectionTestUtils.setField(cmd, "cidrlist", new ArrayList<>());
+        validateAllIp4Cidr(cmd);
+    }
+
+    @Test
+    public void testGetSourceCidrList_NullFirstElement() {
+        final CreateFirewallRuleCmd cmd = new CreateFirewallRuleCmd();
+        List<String> list = new ArrayList<>();
+        list.add(null);
+        ReflectionTestUtils.setField(cmd, "cidrlist", list);
+        validateAllIp4Cidr(cmd);
+    }
+
+    @Test
+    public void testGetSourceCidrList_EmptyFirstElement() {
+        final CreateFirewallRuleCmd cmd = new CreateFirewallRuleCmd();
+        ReflectionTestUtils.setField(cmd, "cidrlist", Collections.singletonList("  "));
+        validateAllIp4Cidr(cmd);
+    }
+
+    @Test
+    public void testGetSourceCidrList_Valid() {
+        final CreateFirewallRuleCmd cmd = new CreateFirewallRuleCmd();
+        String cidr = "10.1.1.1/22";
+        ReflectionTestUtils.setField(cmd, "cidrlist", Collections.singletonList(cidr));
+        Assert.assertTrue(CollectionUtils.isNotEmpty(cmd.getSourceCidrList()));
+        Assert.assertEquals(1, cmd.getSourceCidrList().size());
+        Assert.assertEquals(cidr, cmd.getSourceCidrList().get(0));
+    }
+
+    @Test
+    public void testGetSourceCidrList_EmptyFirstElementButMore() {
+        final CreateFirewallRuleCmd cmd = new CreateFirewallRuleCmd();
+        String cidr = "10.1.1.1/22";
+        ReflectionTestUtils.setField(cmd, "cidrlist", Arrays.asList("  ", cidr));
+        Assert.assertTrue(CollectionUtils.isNotEmpty(cmd.getSourceCidrList()));
+        Assert.assertEquals(2, cmd.getSourceCidrList().size());
+        Assert.assertEquals(cidr, cmd.getSourceCidrList().get(1));
+    }
+}

engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java

@@ -82,6 +82,9 @@ public interface NetworkOrchestrationService {
     ConfigKey<Integer> NetworkLockTimeout = new ConfigKey<Integer>(Integer.class, NetworkLockTimeoutCK, "Network", "600",
         "Lock wait timeout (seconds) while implementing network", true, Scope.Global, null);
 
+    ConfigKey<String> DeniedRoutes = new ConfigKey<String>(String.class, "denied.routes", "Network", "",
+            "Routes that are denied, can not be used for Static Routes creation for the VPC Private Gateway", true, ConfigKey.Scope.Zone, null);
+
     ConfigKey<String> GuestDomainSuffix = new ConfigKey<String>(String.class, GuestDomainSuffixCK, "Network", "cloud.internal",
         "Default domain name for vms inside virtualized networks fronted by router", true, ConfigKey.Scope.Zone, null);
 

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

@@ -4872,7 +4872,7 @@ public String getConfigComponentName() {
 
     @Override
     public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[]{NetworkGcWait, NetworkGcInterval, NetworkLockTimeout,
+        return new ConfigKey<?>[]{NetworkGcWait, NetworkGcInterval, NetworkLockTimeout, DeniedRoutes,
                 GuestDomainSuffix, NetworkThrottlingRate, MinVRVersion,
                 PromiscuousMode, MacAddressChanges, ForgedTransmits, MacLearning, RollingRestartEnabled,
                 TUNGSTEN_ENABLED, NSX_ENABLED };