apache · weizhouapache · Nov 10, 2021 · Oct 19, 2021 · Oct 19, 2021 · Oct 19, 2021
diff --git a/api/src/main/java/com/cloud/agent/api/to/FirewallRuleTO.java b/api/src/main/java/com/cloud/agent/api/to/FirewallRuleTO.java
@@ -155,6 +155,9 @@ public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, Firewa
             rule.getIcmpType(),
             rule.getIcmpCode());
         this.trafficType = trafficType;
+        if (FirewallRule.Purpose.Ipv6Firewall.equals(purpose)) {
+            this.destCidrList = rule.getDestinationCidrList();
+        }
     }
 
     public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, FirewallRule.Purpose purpose, FirewallRule.TrafficType trafficType,

diff --git a/api/src/main/java/com/cloud/agent/api/to/NetworkTO.java b/api/src/main/java/com/cloud/agent/api/to/NetworkTO.java
@@ -39,6 +39,7 @@ public class NetworkTO {
     protected boolean isSecurityGroupEnabled;
     protected String name;
     protected String ip6address;
+    protected String ip6gateway;
     protected String ip6cidr;
 
     public NetworkTO() {
@@ -68,6 +69,10 @@ public void setIp6Address(String addr) {
         this.ip6address = addr;
     }
 
+    public void setIp6Gateway(String gateway) {
+        this.ip6gateway = gateway;
+    }
+
     public void setIp6Cidr(String cidr) {
         this.ip6cidr = cidr;
     }
@@ -161,6 +166,10 @@ public String getIp6Address() {
         return ip6address;
     }
 
+    public String getIp6Gateway() {
+        return ip6gateway;
+    }
+
     public String getIp6Cidr() {
         return ip6cidr;
     }

diff --git a/api/src/main/java/com/cloud/capacity/Capacity.java b/api/src/main/java/com/cloud/capacity/Capacity.java
@@ -30,6 +30,7 @@ public interface Capacity extends InternalIdentity, Identity {
     public static final short CAPACITY_TYPE_VLAN = 7;
     public static final short CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP = 8;
     public static final short CAPACITY_TYPE_LOCAL_STORAGE = 9;
+    public static final short CAPACITY_TYPE_VIRTUAL_NETWORK_IPV6_SUBNET = 10;
     public static final short CAPACITY_TYPE_GPU = 19;
 
     public static final short CAPACITY_TYPE_CPU_CORE = 90;

diff --git a/api/src/main/java/com/cloud/configuration/ConfigurationService.java b/api/src/main/java/com/cloud/configuration/ConfigurationService.java
@@ -20,10 +20,13 @@
 
 import org.apache.cloudstack.api.command.admin.config.ResetCfgCmd;
 import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
+import org.apache.cloudstack.api.command.admin.network.CreateGuestNetworkIpv6PrefixCmd;
 import org.apache.cloudstack.api.command.admin.network.CreateManagementNetworkIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;
+import org.apache.cloudstack.api.command.admin.network.DeleteGuestNetworkIpv6PrefixCmd;
 import org.apache.cloudstack.api.command.admin.network.DeleteManagementNetworkIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;
+import org.apache.cloudstack.api.command.admin.network.ListGuestNetworkIpv6PrefixesCmd;
 import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;
 import org.apache.cloudstack.api.command.admin.network.UpdatePodManagementNetworkIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.offering.CreateDiskOfferingCmd;
@@ -51,6 +54,7 @@
 import org.apache.cloudstack.region.PortableIpRange;
 
 import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenterGuestIpv6Prefix;
 import com.cloud.dc.Pod;
 import com.cloud.dc.Vlan;
 import com.cloud.domain.Domain;
@@ -223,6 +227,21 @@ public interface ConfigurationService {
      */
     void updatePodIpRange(UpdatePodManagementNetworkIpRangeCmd cmd) throws ConcurrentOperationException;
 
+    /**
+     * Creates a new IPv6 prefix for a zone. Needs to be >= /64.
+     */
+    DataCenterGuestIpv6Prefix createDataCenterGuestIpv6Prefix(CreateGuestNetworkIpv6PrefixCmd cmd);
+
+    /**
+     * Lists IPv6 prefixes for a zone.
+     */
+    List<? extends DataCenterGuestIpv6Prefix> listDataCenterGuestIpv6Prefixes(ListGuestNetworkIpv6PrefixesCmd cmd);
+
+    /**
+     * Deletes an existing IPv6 prefix.
+     */
+    boolean deleteDataCenterGuestIpv6Prefix(DeleteGuestNetworkIpv6PrefixCmd cmd);
+
     /**
      * Edits a pod in the database. Will not allow you to edit pods that are being used anywhere in the system.
      *

diff --git a/api/src/main/java/com/cloud/dc/DataCenterGuestIpv6Prefix.java b/api/src/main/java/com/cloud/dc/DataCenterGuestIpv6Prefix.java
@@ -0,0 +1,32 @@
+// 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 com.cloud.dc;
+
+import java.util.Date;
+
+import org.apache.cloudstack.acl.InfrastructureEntity;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface DataCenterGuestIpv6Prefix extends InfrastructureEntity, InternalIdentity, Identity {
+    Long getDataCenterId();
+
+    String getPrefix();
+
+    Date getCreated();
+}
diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java
@@ -31,6 +31,7 @@
 import org.apache.cloudstack.usage.Usage;
 
 import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenterGuestIpv6Prefix;
 import com.cloud.dc.Pod;
 import com.cloud.dc.StorageNetworkIpRange;
 import com.cloud.dc.Vlan;
@@ -148,6 +149,10 @@ public class EventTypes {
     public static final String EVENT_FIREWALL_CLOSE = "FIREWALL.CLOSE";
     public static final String EVENT_FIREWALL_UPDATE = "FIREWALL.UPDATE";
 
+    public static final String EVENT_NET_IP6_ASSIGN = "NET.IP6ASSIGN";
+    public static final String EVENT_NET_IP6_RELEASE = "NET.IP6RELEASE";
+    public static final String EVENT_NET_IP6_UPDATE = "NET.IP6UPDATE";
+
     public static final String EVENT_FIREWALL_EGRESS_OPEN = "FIREWALL.EGRESS.OPEN";
     public static final String EVENT_FIREWALL_EGRESS_CLOSE = "FIREWALL.EGRESS.CLOSE";
     public static final String EVENT_FIREWALL_EGRESS_UPDATE = "FIREWALL.EGRESS.UPDATE";
@@ -332,6 +337,9 @@ public class EventTypes {
     public static final String EVENT_MANAGEMENT_IP_RANGE_DELETE = "MANAGEMENT.IP.RANGE.DELETE";
     public static final String EVENT_MANAGEMENT_IP_RANGE_UPDATE = "MANAGEMENT.IP.RANGE.UPDATE";
 
+    public static final String EVENT_GUEST_IP6_PREFIX_CREATE = "GUEST.IP6.PREFIX.CREATE";
+    public static final String EVENT_GUEST_IP6_PREFIX_DELETE = "GUEST.IP6.PREFIX.DELETE";
+
     public static final String EVENT_STORAGE_IP_RANGE_CREATE = "STORAGE.IP.RANGE.CREATE";
     public static final String EVENT_STORAGE_IP_RANGE_DELETE = "STORAGE.IP.RANGE.DELETE";
     public static final String EVENT_STORAGE_IP_RANGE_UPDATE = "STORAGE.IP.RANGE.UPDATE";
@@ -480,6 +488,11 @@ public class EventTypes {
     public static final String EVENT_NETWORK_ACL_ITEM_UPDATE = "NETWORK.ACL.ITEM.UPDATE";
     public static final String EVENT_NETWORK_ACL_ITEM_DELETE = "NETWORK.ACL.ITEM.DELETE";
 
+    // IPv6 firewall rule
+    public static final String EVENT_IPV6_FIREWALL_RULE_CREATE = "IPV6.FIREWALL.RULE.CREATE";
+    public static final String EVENT_IPV6_FIREWALL_RULE_UPDATE = "IPV6.FIREWALL.RULE.UPDATE";
+    public static final String EVENT_IPV6_FIREWALL_RULE_DELETE = "IPV6.FIREWALL.RULE.DELETE";
+
     // VPC offerings
     public static final String EVENT_VPC_OFFERING_CREATE = "VPC.OFFERING.CREATE";
     public static final String EVENT_VPC_OFFERING_UPDATE = "VPC.OFFERING.UPDATE";
@@ -702,6 +715,9 @@ public class EventTypes {
         entityEventDetails.put(EVENT_FIREWALL_EGRESS_OPEN, FirewallRule.class);
         entityEventDetails.put(EVENT_FIREWALL_EGRESS_CLOSE, FirewallRule.class);
         entityEventDetails.put(EVENT_FIREWALL_EGRESS_UPDATE, FirewallRule.class);
+        entityEventDetails.put(EVENT_NET_IP6_ASSIGN, Network.class);
+        entityEventDetails.put(EVENT_NET_IP6_RELEASE, Network.class);
+        entityEventDetails.put(EVENT_NET_IP6_UPDATE, Network.class);
 
         // Nic Events
         entityEventDetails.put(EVENT_NIC_CREATE, Nic.class);
@@ -843,6 +859,9 @@ public class EventTypes {
         entityEventDetails.put(EVENT_MANAGEMENT_IP_RANGE_CREATE, Pod.class);
         entityEventDetails.put(EVENT_MANAGEMENT_IP_RANGE_DELETE, Pod.class);
 
+        entityEventDetails.put(EVENT_GUEST_IP6_PREFIX_CREATE, DataCenterGuestIpv6Prefix.class);
+        entityEventDetails.put(EVENT_GUEST_IP6_PREFIX_DELETE, DataCenterGuestIpv6Prefix.class);
+
         entityEventDetails.put(EVENT_STORAGE_IP_RANGE_CREATE, StorageNetworkIpRange.class);
         entityEventDetails.put(EVENT_STORAGE_IP_RANGE_DELETE, StorageNetworkIpRange.class);
         entityEventDetails.put(EVENT_STORAGE_IP_RANGE_UPDATE, StorageNetworkIpRange.class);

diff --git a/api/src/main/java/com/cloud/network/Ipv6GuestPrefixSubnetNetworkMap.java b/api/src/main/java/com/cloud/network/Ipv6GuestPrefixSubnetNetworkMap.java
@@ -0,0 +1,37 @@
+// 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 com.cloud.network;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface Ipv6GuestPrefixSubnetNetworkMap extends Identity, InternalIdentity {
+    enum State {
+        Allocating, // The subnet will be assigned to a network
+        Allocated, // The subnet is in use.
+        Free // The subnet is ready to be allocated.
+    }
+
+    long getPrefixId();
+
+    String getSubnet();
+
+    Long getNetworkId();
+
+    State getState();
+}
diff --git a/api/src/main/java/com/cloud/network/Ipv6Service.java b/api/src/main/java/com/cloud/network/Ipv6Service.java
@@ -0,0 +1,94 @@
+// 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 com.cloud.network;
+
+import java.util.List;
+
+import org.apache.cloudstack.api.command.user.ipv6.CreateIpv6FirewallRuleCmd;
+import org.apache.cloudstack.api.command.user.ipv6.ListIpv6FirewallRulesCmd;
+import org.apache.cloudstack.api.command.user.ipv6.UpdateIpv6FirewallRuleCmd;
+import org.apache.cloudstack.api.response.VpcResponse;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenterGuestIpv6Prefix;
+import com.cloud.dc.Vlan;
+import com.cloud.exception.InsufficientAddressCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.network.rules.FirewallRule;
+import com.cloud.network.vpc.Vpc;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.PluggableService;
+import com.cloud.vm.Nic;
+import com.cloud.vm.NicProfile;
+
+public interface Ipv6Service extends PluggableService, Configurable {
+
+    public static final int IPV6_SLAAC_CIDR_NETMASK = 64;
+
+    static final ConfigKey<Boolean> Ipv6OfferingCreationEnabled = new ConfigKey<Boolean>("Advanced", Boolean.class,
+            "ipv6.offering.enabled",
+            "false",
+            "Indicates whether creation of IPv6 network/VPC offering is enabled or not.",
+            true);
+
+    static final ConfigKey<Integer> Ipv6PrefixSubnetCleanupInterval = new ConfigKey<Integer>("Advanced", Integer.class,
+            "network.ipv6.prefix.subnet.cleanup.interval",
+            "1800",
+            "Determines how long (in seconds) to wait before deallocating prefix subnets which are in Allocating state. The default value = 1800 seconds.",
+            true);
+
+    Pair<Integer, Integer> getUsedTotalIpv6SubnetForPrefix(DataCenterGuestIpv6Prefix prefix);
+
+    Pair<Integer, Integer> getUsedTotalIpv6SubnetForZone(long zoneId);
+
+    Pair<String, String> preAllocateIpv6SubnetForNetwork(long zoneId) throws ResourceAllocationException;
+
+    void assignIpv6SubnetToNetwork(String subnet, long networkId);
+
+    void releaseIpv6SubnetForNetwork(long networkId);
+
+    List<String> getAllocatedIpv6FromVlanRange(Vlan vlan);
+
+    Nic assignPublicIpv6ToNetwork(Network network, Nic nic);
+
+    void updateNicIpv6(NicProfile nic, DataCenter dc, Network network) throws InsufficientAddressCapacityException;
+
+    void releasePublicIpv6ForNic(Network network, String nicIpv6Address);
+
+    List<String> getPublicIpv6AddressesForNetwork(Network network);
+
+    void updateIpv6RoutesForVpcResponse(Vpc vpc, VpcResponse response);
+
+    void checkNetworkIpv6Upgrade(Network network) throws InsufficientAddressCapacityException, ResourceAllocationException;
+
+    FirewallRule updateIpv6FirewallRule(UpdateIpv6FirewallRuleCmd updateIpv6FirewallRuleCmd);
+
+    Pair<List<? extends FirewallRule>,Integer> listIpv6FirewallRules(ListIpv6FirewallRulesCmd listIpv6FirewallRulesCmd);
+
+    boolean revokeIpv6FirewallRule(Long id);
+
+    FirewallRule createIpv6FirewallRule(CreateIpv6FirewallRuleCmd createIpv6FirewallRuleCmd) throws NetworkRuleConflictException;
+
+    FirewallRule getIpv6FirewallRule(Long entityId);
+
+    boolean applyIpv6FirewallRule(long id);
+
+    void removePublicIpv6PlaceholderNics(Network network);
+}
diff --git a/api/src/main/java/com/cloud/network/Network.java b/api/src/main/java/com/cloud/network/Network.java
@@ -22,16 +22,15 @@
 import java.util.Date;
 import java.util.List;
 
-import com.cloud.exception.InvalidParameterValueException;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.StringUtils;
 
+import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.Networks.Mode;
 import com.cloud.network.Networks.TrafficType;
@@ -79,6 +78,22 @@ static PVlanType fromValue(String type) {
         }
     }
 
+    enum Routing {
+        Static, Dynamic;
+
+        public static Routing fromValue(String type) {
+            if (StringUtils.isBlank(type)) {
+                return null;
+            } else if (type.equalsIgnoreCase("Static")) {
+                return Static;
+            } else if (type.equalsIgnoreCase("Dynamic")) {
+                return Dynamic;
+            } else {
+                throw new InvalidParameterValueException("Unexpected Routing type : " + type);
+            }
+        }
+    }
+
     String updatingInSequence = "updatingInSequence";
     String hideIpAddressUsage = "hideIpAddressUsage";
 

diff --git a/api/src/main/java/com/cloud/network/rules/FirewallRule.java b/api/src/main/java/com/cloud/network/rules/FirewallRule.java
@@ -25,7 +25,7 @@
 
 public interface FirewallRule extends ControlledEntity, Identity, InternalIdentity, Displayable {
     enum Purpose {
-        Firewall, PortForwarding, LoadBalancing, Vpn, StaticNat, NetworkACL,
+        Firewall, PortForwarding, LoadBalancing, Vpn, StaticNat, NetworkACL, Ipv6Firewall,
     }
 
     enum FirewallRuleType {

diff --git a/api/src/main/java/com/cloud/network/vpc/VpcProvisioningService.java b/api/src/main/java/com/cloud/network/vpc/VpcProvisioningService.java
@@ -25,6 +25,7 @@
 import org.apache.cloudstack.api.command.user.vpc.ListVPCOfferingsCmd;
 
 import com.cloud.utils.Pair;
+import com.cloud.utils.net.NetUtils;
 
 public interface VpcProvisioningService {
 
@@ -34,7 +35,7 @@ public interface VpcProvisioningService {
 
     VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices,
                                   Map<String, List<String>> serviceProviders,
-                                  Map serviceCapabilitystList,
+                                  Map serviceCapabilitystList, NetUtils.InternetProtocol internetProtocol,
                                   Long serviceOfferingId, List<Long> domainIds, List<Long> zoneIds, VpcOffering.State state);
 
     Pair<List<? extends VpcOffering>,Integer> listVpcOfferings(ListVPCOfferingsCmd cmd);