apache · radu-todirica · Jul 6, 2020 · Jul 7, 2020 · Jul 8, 2020 · Jul 27, 2020
diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java
@@ -161,6 +161,35 @@ public class EventTypes {
     public static final String EVENT_FIREWALL_EGRESS_CLOSE = "FIREWALL.EGRESS.CLOSE";
     public static final String EVENT_FIREWALL_EGRESS_UPDATE = "FIREWALL.EGRESS.UPDATE";
 
+    // Tungsten-Fabric
+    public static final String EVENT_TUNGSTEN_ADD_POLICY_RULE = "TUNGSTEN.ADD.POLICY.RULE";
+    public static final String EVENT_TUNGSTEN_APPLY_POLICY = "TUNGSTEN.APPLY.POLICY";
+    public static final String EVENT_TUNGSTEN_APPLY_TAG = "TUNGSTEN.APPLY.TAG";
+    public static final String EVENT_TUNGSTEN_CREATE_POLICY = "TUNGSTEN.CREATE.POLICY";
+    public static final String EVENT_TUNGSTEN_CREATE_TAG = "TUNGSTEN.CREATE.TAG";
+    public static final String EVENT_TUNGSTEN_CREATE_TAGTYPE = "TUNGSTEN.CREATE.TAGTYPE";
+    public static final String EVENT_TUNGSTEN_CREATE_ADDRESS_GROUP = "TUNGSTEN.CREATE.ADDRESS.GROUP";
+    public static final String EVENT_TUNGSTEN_CREATE_SERVICE_GROUP = "TUNGSTEN.CREATE.SERVICE.GROUP";
+    public static final String EVENT_TUNGSTEN_CREATE_APPLICATION_POLICY_SET = "TUNGSTEN.CREATE.APS";
+    public static final String EVENT_TUNGSTEN_CREATE_FIREWALL_POLICY = "TUNGSTEN.CREATE.FIREWALL.POLICY";
+    public static final String EVENT_TUNGSTEN_CREATE_FIREWALL_RULE = "TUNGSTEN.CREATE.FIREWALL.RULE";
+    public static final String EVENT_TUNGSTEN_DELETE_POLICY = "TUNGSTEN.DELETE.POLICY";
+    public static final String EVENT_TUNGSTEN_DELETE_TAG = "TUNGSTEN.DELETE.TAG";
+    public static final String EVENT_TUNGSTEN_DELETE_TAGTYPE = "TUNGSTEN.DELETE.TAGTYPE";
+    public static final String EVENT_TUNGSTEN_DELETE_ADDRESS_GROUP = "TUNGSTEN.DELETE.ADDRESS.GROUP";
+    public static final String EVENT_TUNGSTEN_DELETE_APPLICATION_POLICY_SET = "TUNGSTEN.DELETE.APS";
+    public static final String EVENT_TUNGSTEN_DELETE_FIREWALL_POLICY = "TUNGSTEN.DELETE.FIREWALL.POLICY";
+    public static final String EVENT_TUNGSTEN_DELETE_FIREWALL_RULE = "TUNGSTEN.DELETE.FIREWALL.RULE";
+    public static final String EVENT_TUNGSTEN_DELETE_SERVICE_GROUP = "TUNGSTEN.DELETE.SERVICE.GROUP";
+    public static final String EVENT_TUNGSTEN_REMOVE_POLICY = "TUNGSTEN.REMOVE.POLICY";
+    public static final String EVENT_TUNGSTEN_REMOVE_TAG = "TUNGSTEN.REMOVE.TAG";
+    public static final String EVENT_TUNGSTEN_REMOVE_POLICY_RULE = "TUNGSTEN.REMOVE.POLICY.RULE";
+    public static final String EVENT_TUNGSTEN_CREATE_LOGICAL_ROUTER = "TUNGSTEN.CREATE.LOGICAL.ROUTER";
+    public static final String EVENT_TUNGSTEN_ADD_NETWORK_GATEWAY_TO_LOGICAL_ROUTER = "TUNGSTEN.ADD.NETWORK.GW.TO.LG";
+    public static final String EVENT_TUNGSTEN_REMOVE_NETWORK_GATEWAY_FROM_LOGICAL_ROUTER = "TUNGSTEN.RM.NETWORK.GW.FROM.LG";
+    public static final String EVENT_TUNGSTEN_DELETE_LOGICAL_ROUTER = "TUNGSTEN.DELETE.LOGICAL.ROUTER";
+    public static final String EVENT_TUNGSTEN_UPDATE_LB_HEALTH_MONITOR = "TUNGSTEN.UPDATE.LB.HM";
+
     //NIC Events
     public static final String EVENT_NIC_CREATE = "NIC.CREATE";
     public static final String EVENT_NIC_DELETE = "NIC.DELETE";

diff --git a/api/src/main/java/com/cloud/network/Network.java b/api/src/main/java/com/cloud/network/Network.java
@@ -202,6 +202,8 @@ public static class Provider {
         public static final Provider BigSwitchBcf = new Provider("BigSwitchBcf", false);
         //Add ConfigDrive provider
         public static final Provider ConfigDrive = new Provider("ConfigDrive", false);
+        //Add Tungsten Fabric provider
+        public static final Provider Tungsten = new Provider("Tungsten", false);
 
         private final String name;
         private final boolean isExternal;

diff --git a/api/src/main/java/com/cloud/network/NetworkService.java b/api/src/main/java/com/cloud/network/NetworkService.java
@@ -225,4 +225,7 @@ Network createPrivateNetwork(String networkName, String displayText, long physic
     boolean removeNetworkPermissions(RemoveNetworkPermissionsCmd removeNetworkPermissionsCmd);
 
     boolean resetNetworkPermissions(ResetNetworkPermissionsCmd resetNetworkPermissionsCmd);
+
+    public static final String MESSAGE_ASSIGN_NIC_SECONDARY_IP_EVENT = "Message.AssignNicSecondaryIp.Event";
+    public static final String MESSAGE_RELEASE_NIC_SECONDARY_IP_EVENT = "Message.ReleaseNicSecondaryIp.Event";
 }
diff --git a/api/src/main/java/com/cloud/network/Networks.java b/api/src/main/java/com/cloud/network/Networks.java
@@ -127,7 +127,8 @@ public <T> URI toUri(T value) {
             }
         },
         UnDecided(null, null),
-        OpenDaylight("opendaylight", String.class);
+        OpenDaylight("opendaylight", String.class),
+        TUNGSTEN("tf", String.class);
 
         private final String scheme;
         private final Class<?> type;

diff --git a/api/src/main/java/com/cloud/network/TungstenProvider.java b/api/src/main/java/com/cloud/network/TungstenProvider.java
@@ -0,0 +1,31 @@
+// 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 TungstenProvider extends InternalIdentity, Identity {
+    String getHostname();
+    String getPort();
+    String getProviderName();
+    String getGateway();
+    String getIntrospectPort();
+    String getVrouterPort();
+    long getZoneId();
+    long getHostId();
+}
diff --git a/api/src/main/java/com/cloud/network/security/SecurityGroupService.java b/api/src/main/java/com/cloud/network/security/SecurityGroupService.java
@@ -55,4 +55,9 @@ List<? extends SecurityRule> authorizeSecurityGroupRule(final Long securityGroup
     public List<? extends SecurityRule> authorizeSecurityGroupEgress(AuthorizeSecurityGroupEgressCmd cmd);
 
     public boolean securityGroupRulesForVmSecIp(long nicId, String secondaryIp, boolean ruleAction);
+
+    String MESSAGE_CREATE_TUNGSTEN_SECURITY_GROUP_EVENT = "Message.CreateTungstenSecurityGroup.Event";
+    String MESSAGE_DELETE_TUNGSTEN_SECURITY_GROUP_EVENT = "Message.DeleteTungstenSecurityGroup.Event";
+    String MESSAGE_ADD_SECURITY_GROUP_RULE_EVENT = "Message.AddSecurityGroupRule.Event";
+    String MESSAGE_REMOVE_SECURITY_GROUP_RULE_EVENT = "Message.RemoveSecurityGroupRule.Event";
 }
diff --git a/api/src/main/java/com/cloud/network/security/TungstenSecurityGroupRule.java b/api/src/main/java/com/cloud/network/security/TungstenSecurityGroupRule.java
@@ -0,0 +1,23 @@
+// 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.security;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface TungstenSecurityGroupRule extends Identity, InternalIdentity {
+}
diff --git a/api/src/main/java/com/cloud/offering/NetworkOffering.java b/api/src/main/java/com/cloud/offering/NetworkOffering.java
@@ -51,6 +51,7 @@ public enum Detail {
     public final static String SystemPrivateGatewayNetworkOfferingWithoutVlan = "System-Private-Gateway-Network-Offering-Without-Vlan";
 
     public final static String DefaultSharedNetworkOfferingWithSGService = "DefaultSharedNetworkOfferingWithSGService";
+    public static final String DEFAULT_TUNGSTEN_SHARED_NETWORK_OFFERING_WITH_SGSERVICE = "DefaultTungstenSharedNetworkOfferingWithSGService";
     public final static String QuickCloudNoServices = "QuickCloudNoServices";
     public final static String DefaultIsolatedNetworkOfferingWithSourceNatService = "DefaultIsolatedNetworkOfferingWithSourceNatService";
     public final static String OvsIsolatedNetworkOfferingWithSourceNatService = "OvsIsolatedNetworkOfferingWithSourceNatService";
@@ -87,6 +88,8 @@ public enum Detail {
 
     boolean isForVpc();
 
+    boolean isForTungsten();
+
     TrafficType getTrafficType();
 
     boolean isSpecifyVlan();

diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -649,6 +649,67 @@ public class ApiConstants {
     public static final String VSWITCH_TYPE_PUBLIC_TRAFFIC = "publicvswitchtype";
     public static final String VSWITCH_NAME_GUEST_TRAFFIC = "guestvswitchname";
     public static final String VSWITCH_NAME_PUBLIC_TRAFFIC = "publicvswitchname";
+    // Tungsten-Fabric
+    public static final String TUNGSTEN_VIRTUAL_ROUTER_UUID = "tungstenvirtualrouteruuid";
+    public static final String TUNGSTEN_PROVIDER_HOSTNAME = "tungstenproviderhostname";
+    public static final String TUNGSTEN_PROVIDER_PORT = "tungstenproviderport";
+    public static final String TUNGSTEN_PROVIDER_UUID = "tungstenprovideruuid";
+    public static final String TUNGSTEN_GATEWAY = "tungstengateway";
+    public static final String TUNGSTEN_PROVIDER_VROUTER_PORT = "tungstenprovidervrouterport";
+    public static final String TUNGSTEN_PROVIDER_INTROSPECT_PORT = "tungstenproviderintrospectport";
+    public static final String SRC_NETWORK = "srcnetwork";
+    public static final String SRC_IP_PREFIX = "srcipprefix";
+    public static final String SRC_IP_PREFIX_LEN = "srcipprefixlen";
+    public static final String SRC_START_PORT = "srcstartport";
+    public static final String SRC_END_PORT = "srcendport";
+    public static final String DEST_NETWORK = "destnetwork";
+    public static final String DEST_IP_PREFIX = "destipprefix";
+    public static final String DEST_IP_PREFIX_LEN = "destipprefixlen";
+    public static final String DEST_START_PORT = "deststartport";
+    public static final String DEST_END_PORT = "destendport";
+    public static final String MAJOR_SEQUENCE = "majorsequence";
+    public static final String MINOR_SEQUENCE = "minorsequence";
+    public static final String POLICY_UUID = "policyuuid";
+    public static final String RULE_UUID = "ruleuuid";
+    public static final String DIRECTION = "direction";
+    public static final String TAG_UUID = "taguuid";
+    public static final String TAG_TYPE = "tagtype";
+    public static final String TAG_VALUE = "tagvalue";
+    public static final String TAG_TYPE_UUID = "tagtypeuuid";
+    public static final String NETWORK_UUID = "networkuuid";
+    public static final String NIC_UUID = "nicuuid";
+    public static final String VM_UUID = "vmuuid";
+    public static final String ONE_WAY = "oneway";
+    public static final String POLICY = "policy";
+    public static final String VM = "vm";
+    public static final String FIREWALL_POLICY = "firewallpolicy";
+    public static final String FIREWALL_RULE = "firewallrule";
+    public static final String TAG = "tag";
+    public static final String APPLICATION_POLICY_SET_UUID = "applicationpolicysetuuid";
+    public static final String FIREWALL_POLICY_UUID = "firewallpolicyuuid";
+    public static final String FIREWALL_RULE_UUID = "firewallruleuuid";
+    public static final String ADDRESS_GROUP_UUID = "addressgroupuuid";
+    public static final String SERVICE_GROUP_UUID = "servicegroupuuid";
+    public static final String SEQUENCE = "sequence";
+    public static final String SERVICE_GROUP = "servicegroup";
+    public static final String SRC_ADDRESS_GROUP = "srcaddressgroup";
+    public static final String DEST_ADDRESS_GROUP = "destaddressgroup";
+    public static final String SRC_TAG = "srctag";
+    public static final String DEST_TAG = "desttag";
+    public static final String IP_PREFIX = "ipprefix";
+    public static final String IP_PREFIX_LEN = "ipprefixlen";
+    public static final String SRC_ADDRESS_GROUP_UUID = "srcaddressgroupuuid";
+    public static final String DEST_ADDRESS_GROUP_UUID = "destaddressgroupuuid";
+    public static final String SRC_TAG_UUID = "srctaguuid";
+    public static final String DEST_TAG_UUID = "desttaguuid";
+    public static final String SRC_NETWORK_UUID = "srcnetworkuuid";
+    public static final String DEST_NETWORK_UUID = "destnetworkuuid";
+    public static final String LOGICAL_ROUTER_UUID = "logicalrouteruuid";
+    public static final String RETRY = "retry";
+    public static final String HTTP_METHOD = "httpmethodtype";
+    public static final String EXPECTED_CODE = "expectedcode";
+    public static final String URL_PATH = "urlpath";
+
     // Ovs controller
     public static final String OVS_DEVICE_ID = "ovsdeviceid";
     public static final String OVS_DEVICE_NAME = "ovsdevicename";
@@ -705,6 +766,7 @@ public class ApiConstants {
     public static final String FORCE_ENCAP = "forceencap";
     public static final String SPLIT_CONNECTIONS = "splitconnections";
     public static final String FOR_VPC = "forvpc";
+    public static final String FOR_TUNGSTEN = "fortungsten";
     public static final String SHRINK_OK = "shrinkok";
     public static final String NICIRA_NVP_DEVICE_ID = "nvpdeviceid";
     public static final String NICIRA_NVP_TRANSPORT_ZONE_UUID = "transportzoneuuid";

diff --git a/...c/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/...c/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
@@ -127,6 +127,11 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
             description = "true if network offering is meant to be used for VPC, false otherwise.")
     private Boolean forVpc;
 
+    @Parameter(name = ApiConstants.FOR_TUNGSTEN,
+            type = CommandType.BOOLEAN,
+            description = "true if network offering is meant to be used for Tungsten-Fabric, false otherwise.")
+    private Boolean forTungsten;
+
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, since = "4.2.0", description = "Network offering details in key/value pairs."
             + " Supported keys are internallbprovider/publiclbprovider with service provider as a value, and"
             + " promiscuousmode/macaddresschanges/forgedtransmits with true/false as value to accept/reject the security settings if available for a nic/portgroup")
@@ -240,6 +245,10 @@ public Boolean getForVpc() {
         return forVpc;
     }
 
+    public Boolean getForTungsten() {
+        return forTungsten;
+    }
+
     public Boolean getEgressDefaultPolicy() {
         if (egressDefaultPolicy == null) {
             return true;

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
@@ -127,6 +127,9 @@ public class CreateNetworkCmd extends BaseCmd implements UserCmd {
     @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "the VPC network belongs to")
     private Long vpcId;
 
+    @Parameter(name = ApiConstants.TUNGSTEN_VIRTUAL_ROUTER_UUID, type = CommandType.STRING, description = "Tungsten-Fabric virtual router the network belongs to")
+    private String tungstenVirtualRouterUuid;
+
     @Parameter(name = ApiConstants.START_IPV6, type = CommandType.STRING, description = "the beginning IPv6 address in the IPv6 network range")
     private String startIpv6;
 
@@ -248,6 +251,10 @@ public Long getAssociatedNetworkId() {
         return associatedNetworkId;
     }
 
+    public String getTungstenVirtualRouterUuid() {
+        return tungstenVirtualRouterUuid;
+    }
+
     @Override
     public boolean isDisplay() {
         if(displayNetwork == null)

diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
@@ -99,6 +99,10 @@ public class NetworkOfferingResponse extends BaseResponseWithAnnotations {
     @Param(description = "true if network offering can be used by VPC networks only")
     private Boolean forVpc;
 
+    @SerializedName(ApiConstants.FOR_TUNGSTEN)
+    @Param(description = "true if network offering can be used by Tungsten-Fabric networks only")
+    private Boolean forTungsten;
+
     @SerializedName(ApiConstants.IS_PERSISTENT)
     @Param(description = "true if network offering supports persistent networks, false otherwise")
     private Boolean isPersistent;
@@ -211,6 +215,10 @@ public void setForVpc(Boolean forVpc) {
         this.forVpc = forVpc;
     }
 
+    public void setForTungsten(Boolean forTungsten) {
+        this.forTungsten = forTungsten;
+    }
+
     public void setIsPersistent(Boolean isPersistent) {
         this.isPersistent = isPersistent;
     }

diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
@@ -203,6 +203,10 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement
     @Param(description = "the name of the Network associated with this network")
     private String associatedNetworkName;
 
+    @SerializedName(ApiConstants.TUNGSTEN_VIRTUAL_ROUTER_UUID)
+    @Param(description = "Tungsten-Fabric virtual router the network belongs to")
+    private String tungstenVirtualRouterUuid;
+
     @SerializedName(ApiConstants.CAN_USE_FOR_DEPLOY)
     @Param(description = "list networks available for vm deployment")
     private Boolean canUseForDeploy;
@@ -538,6 +542,10 @@ public void setRedundantRouter(Boolean redundantRouter) {
         this.redundantRouter = redundantRouter;
     }
 
+    public String getTungstenVirtualRouterUuid() {
+        return tungstenVirtualRouterUuid;
+    }
+
     public Boolean getSupportsVmAutoScaling() {
         return supportsVmAutoScaling;
     }
@@ -546,6 +554,10 @@ public void setSupportsVmAutoScaling(Boolean supportsVmAutoScaling) {
         this.supportsVmAutoScaling = supportsVmAutoScaling;
     }
 
+    public void setTungstenVirtualRouterUuid(String tungstenVirtualRouterUuid) {
+        this.tungstenVirtualRouterUuid = tungstenVirtualRouterUuid;
+    }
+
     public String getVpcName() {
         return vpcName;
     }

diff --git a/client/pom.xml b/client/pom.xml
@@ -32,8 +32,17 @@
             <id>juniper-contrail</id>
             <url>https://juniper.github.io/contrail-maven/snapshots</url>
         </repository>
+        <repository>
+            <id>juniper-tungsten-api</id>
+            <url>https://github.com/radu-todirica/tungsten-api/raw/master</url>
+        </repository>
     </repositories>
     <dependencies>
+        <dependency>
+            <groupId>net.juniper.tungsten</groupId>
+            <artifactId>juniper-tungsten-api</artifactId>
+            <version>2.0</version>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -202,6 +211,11 @@
             <artifactId>cloud-plugin-network-ovs</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-plugin-network-tungsten</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>
             <artifactId>cloud-plugin-network-elb</artifactId>