IPv6 with static routing

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;
     }

api/src/main/java/com/cloud/event/EventTypes.java

@@ -478,6 +478,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";

api/src/main/java/com/cloud/network/Ipv6Address.java

@@ -0,0 +1,93 @@
+// 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.Date;
+
+import org.apache.cloudstack.api.Displayable;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+import org.apache.commons.lang3.StringUtils;
+
+import com.cloud.exception.InvalidParameterValueException;
+
+/**
+ *
+ * - Allocated = null
+ * - AccountId = null
+ * - DomainId = null
+ *
+ * - State = Allocated
+ * - AccountId = account owner.
+ * - DomainId = domain of the account owner.
+ * - Allocated = time it was allocated.
+ */
+public interface Ipv6Address extends Identity, InternalIdentity, Displayable {
+
+    enum InternetProtocol {
+        IPv4, IPv6, DualStack;
+
+        public static InternetProtocol fromValue(String protocol) {
+            if (StringUtils.isBlank(protocol)) {
+                return null;
+            } else if (protocol.equalsIgnoreCase("IPv4")) {
+                return IPv4;
+            } else if (protocol.equalsIgnoreCase("IPv6")) {
+                return IPv6;
+            } else if (protocol.equalsIgnoreCase("DualStack")) {
+                return DualStack;
+            }
+            throw new InvalidParameterValueException("Unexpected Internet Protocol : " + protocol);
+        }
+    }
+
+    enum IPv6Routing {
+        Static, Dynamic;
+
+        public static IPv6Routing fromValue(String mode) {
+            if (StringUtils.isBlank(mode)) {
+                return null;
+            } else if (mode.equalsIgnoreCase("Static")) {
+                return Static;
+            } else if (mode.equalsIgnoreCase("Dynamic")) {
+                return Dynamic;
+            }
+            throw new InvalidParameterValueException("Unexpected IPv6 routing mode : " + mode);
+        }
+    }
+
+    long getDataCenterId();
+
+    long getPhysicalNetworkId();
+
+    String getIp6Gateway();
+
+    String getIp6Cidr();
+
+    String getRouterIpv6();
+
+    String getRouterIpv6Gateway();
+
+    Long getNetworkId();
+
+    Long getDomainId();
+
+    Long getAccountId();
+
+    Date getTakenAt();
+
+}

api/src/main/java/com/cloud/network/Ipv6Service.java

@@ -0,0 +1,79 @@
+// 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 com.cloud.dc.DataCenter;
+import com.cloud.network.rules.FirewallRule;
+import com.cloud.utils.Pair;
+import com.cloud.vm.NicProfile;
+import org.apache.cloudstack.api.command.admin.ipv6.CreateIpv6RangeCmd;
+import org.apache.cloudstack.api.command.admin.ipv6.DedicateIpv6RangeCmd;
+import org.apache.cloudstack.api.command.admin.ipv6.DeleteIpv6RangeCmd;
+import org.apache.cloudstack.api.command.admin.ipv6.ListIpv6RangesCmd;
+import org.apache.cloudstack.api.command.admin.ipv6.ReleaseIpv6RangeCmd;
+import org.apache.cloudstack.api.command.admin.ipv6.UpdateIpv6RangeCmd;
+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.Ipv6RangeResponse;
+
+import java.util.List;
+
+public interface Ipv6Service {
+
+    public static final String IPV6_CIDR_SUFFIX = "/64";
+
+    Ipv6Address createIpv6Range(CreateIpv6RangeCmd cmd);
+
+    Ipv6Address updateIpv6Range(UpdateIpv6RangeCmd cmd);
+
+    boolean deleteIpv6Range(DeleteIpv6RangeCmd cmd);
+
+    Ipv6Address dedicateIpv6Range(DedicateIpv6RangeCmd cmd);
+
+    boolean releaseIpv6Range(ReleaseIpv6RangeCmd cmd);
+
+    Ipv6Address takeIpv6Range(long zoneId, boolean isRouterIpv6Null);
+
+    Pair<List<? extends Ipv6Address>, Integer> searchForIpv6Range(ListIpv6RangesCmd cmd);
+
+    Ipv6RangeResponse createIpv6RangeResponse(Ipv6Address address);
+
+    Ipv6Address.InternetProtocol getNetworkOfferingInternetProtocol(Long offeringId);
+
+    Ipv6Address.IPv6Routing getNetworkOfferingIpv6Routing(Long offeringId);
+
+    boolean isIpv6Supported(Long offeringId);
+
+    Boolean isIpv6FirewallEnabled(Long offeringId);
+
+    Boolean isSpecifyRouterIpv6(Long offeringId);
+
+    void updateNicIpv6(NicProfile nic, DataCenter dc, Network network);
+
+    FirewallRule updateIpv6FirewallRule(UpdateIpv6FirewallRuleCmd updateIpv6FirewallRuleCmd);
+
+    Pair<List<? extends FirewallRule>,Integer> listIpv6FirewallRules(ListIpv6FirewallRulesCmd listIpv6FirewallRulesCmd);
+
+    boolean revokeIpv6FirewallRule(Long id);
+
+    FirewallRule createIpv6FirewallRule(CreateIpv6FirewallRuleCmd createIpv6FirewallRuleCmd);
+
+    FirewallRule getIpv6FirewallRule(Long entityId);
+
+    boolean applyIpv6FirewallRule(long id);
+}

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 {

api/src/main/java/com/cloud/offering/NetworkOffering.java

@@ -40,7 +40,8 @@ public enum State {
     }
 
     public enum Detail {
-        InternalLbProvider, PublicLbProvider, servicepackageuuid, servicepackagedescription, PromiscuousMode, MacAddressChanges, ForgedTransmits, MacLearning, RelatedNetworkOffering, domainid, zoneid, pvlanType
+        InternalLbProvider, PublicLbProvider, servicepackageuuid, servicepackagedescription, PromiscuousMode, MacAddressChanges, ForgedTransmits, MacLearning, RelatedNetworkOffering, domainid, zoneid, pvlanType,
+        internetProtocol, ipv6Routing, ipv6Firewall, specifyRouterIpv6;
     }
 
     public final static String SystemPublicNetwork = "System-Public-Network";

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -822,6 +822,7 @@ public class ApiConstants {
     public static final String ROUTER_CHECK_TYPE = "checktype";
     public static final String ROUTER_IP = "routerip";
     public static final String ROUTER_IPV6 = "routeripv6";
+    public static final String ROUTER_IPV6_GATEWAY = "routeripv6gateway";
     public static final String LAST_UPDATED = "lastupdated";
     public static final String PERFORM_FRESH_CHECKS = "performfreshchecks";
     public static final String CACHE_MODE = "cachemode";
@@ -864,6 +865,11 @@ public class ApiConstants {
     public static final String ADMINS_ONLY = "adminsonly";
     public static final String ANNOTATION_FILTER = "annotationfilter";
 
+    public static final String INTERNET_PROTOCOL = "internetprotocol";
+    public static final String IPV6_ROUTING = "ipv6routing";
+    public static final String IPV6_FIREWALL = "ipv6firewall";
+    public static final String SPECIFY_ROUTER_IPV6 = "specifyrouteripv6";
+
     public enum BootType {
         UEFI, BIOS;
 

api/src/main/java/org/apache/cloudstack/api/BaseCmd.java

@@ -55,6 +55,7 @@
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.Ipv6Service;
 import com.cloud.network.NetworkModel;
 import com.cloud.network.NetworkService;
 import com.cloud.network.NetworkUsageService;
@@ -207,6 +208,8 @@ public static enum CommandType {
     public AnnotationService annotationService;
     @Inject
     public ResourceIconManager resourceIconManager;
+    @Inject
+    public Ipv6Service ipv6Service;
 
     public abstract void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
         ResourceAllocationException, NetworkRuleConflictException;

api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java

@@ -491,4 +491,5 @@ List<TemplateResponse> createTemplateResponses(ResponseView view, VirtualMachine
 
     ResourceIconResponse createResourceIconResponse(ResourceIcon resourceIcon);
 
+    FirewallRuleResponse createIpv6FirewallRuleResponse(FirewallRule acl);
 }