apache
diff --git a/‎api/src/main/java/com/cloud/agent/api/to/NicTO.java‎
Lines changed: 19 additions & 0 deletions b/‎api/src/main/java/com/cloud/agent/api/to/NicTO.java‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java‎
Lines changed: 9 additions & 0 deletions b/‎api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎api/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterHelper.java‎
Lines changed: 1 addition & 0 deletions b/‎api/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterHelper.java‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎api/src/main/java/com/cloud/network/IpAddress.java‎
Lines changed: 2 additions & 0 deletions b/‎api/src/main/java/com/cloud/network/IpAddress.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎api/src/main/java/com/cloud/network/Network.java‎
Lines changed: 4 additions & 0 deletions b/‎api/src/main/java/com/cloud/network/Network.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎api/src/main/java/com/cloud/network/NetworkService.java‎
Lines changed: 3 additions & 0 deletions b/‎api/src/main/java/com/cloud/network/NetworkService.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎api/src/main/java/com/cloud/network/Networks.java‎
Lines changed: 2 additions & 1 deletion b/‎api/src/main/java/com/cloud/network/Networks.java‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎api/src/main/java/com/cloud/network/guru/NetworkGuru.java‎
Lines changed: 10 additions & 6 deletions b/‎api/src/main/java/com/cloud/network/guru/NetworkGuru.java‎
Lines changed: 10 additions & 6 deletions
diff --git a/‎api/src/main/java/com/cloud/network/nsx/NsxProvider.java‎
Lines changed: 34 additions & 0 deletions b/‎api/src/main/java/com/cloud/network/nsx/NsxProvider.java‎
Lines changed: 34 additions & 0 deletions
diff --git a/‎api/src/main/java/com/cloud/network/nsx/NsxService.java‎
Lines changed: 26 additions & 0 deletions b/‎api/src/main/java/com/cloud/network/nsx/NsxService.java‎
Lines changed: 26 additions & 0 deletions
@@ -32,6 +32,9 @@ public class NicTO extends NetworkTO {
     Map<NetworkOffering.Detail, String> details;
     boolean dpdkEnabled;
     Integer mtu;
+    Long networkId;
+
+    String networkSegmentName;
 
     public NicTO() {
         super();
@@ -127,4 +130,20 @@ public Integer getMtu() {
     public void setMtu(Integer mtu) {
         this.mtu = mtu;
     }
+
+    public Long getNetworkId() {
+        return networkId;
+    }
+
+    public void setNetworkId(Long networkId) {
+        this.networkId = networkId;
+    }
+
+    public String getNetworkSegmentName() {
+        return networkSegmentName;
+    }
+
+    public void setNetworkSegmentName(String networkSegmentName) {
+        this.networkSegmentName = networkSegmentName;
+    }
 }
@@ -82,6 +82,7 @@ public class VirtualMachineTO {
 
     Map<String, String> guestOsDetails = new HashMap<String, String>();
     Map<String, String> extraConfig = new HashMap<>();
+    Map<Long, String> networkIdToNetworkNameMap = new HashMap<>();
     DeployAsIsInfoTO deployAsIsInfo;
 
     public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader,
@@ -392,6 +393,14 @@ public Map<String, String> getExtraConfig() {
         return extraConfig;
     }
 
+    public Map<Long, String> getNetworkIdToNetworkNameMap() {
+        return networkIdToNetworkNameMap;
+    }
+
+    public void setNetworkIdToNetworkNameMap(Map<Long, String> networkIdToNetworkNameMap) {
+        this.networkIdToNetworkNameMap = networkIdToNetworkNameMap;
+    }
+
     public String getBootType() {
         return bootType;
     }
 
@@ -22,4 +22,5 @@
 public interface KubernetesClusterHelper extends Adapter {
 
     ControlledEntity findByUuid(String uuid);
+    ControlledEntity findByVmId(long vmId);
 }
@@ -97,4 +97,6 @@ enum Purpose {
 
     void setRuleState(State ruleState);
 
+    boolean isForSystemVms();
+
 }
@@ -205,6 +205,8 @@ public static class Provider {
         //Add Tungsten Fabric provider
         public static final Provider Tungsten = new Provider("Tungsten", false);
 
+        public static final Provider Nsx = new Provider("Nsx", false);
+
         private final String name;
         private final boolean isExternal;
 
@@ -427,6 +429,8 @@ public void setIp6Address(String ip6Address) {
 
     long getDataCenterId();
 
+    long getAccountId();
+
     long getNetworkOfferingId();
 
     @Override
 
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.cloud.dc.DataCenter;
 import org.apache.cloudstack.api.command.admin.address.ReleasePodIpCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd;
 import org.apache.cloudstack.api.command.admin.network.ListDedicatedGuestVlanRangesCmd;
@@ -87,6 +88,8 @@ IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId, Boolean displ
 
     IpAddress reserveIpAddress(Account account, Boolean displayIp, Long ipAddressId) throws ResourceAllocationException;
 
+    IpAddress reserveIpAddressWithVlanDetail(Account account, DataCenter zone, Boolean displayIp, String vlanDetailKey) throws ResourceAllocationException;
+
     boolean releaseReservedIpAddress(long ipAddressId) throws InsufficientAddressCapacityException;
 
     boolean releaseIpAddress(long ipAddressId) throws InsufficientAddressCapacityException;
 
@@ -128,7 +128,8 @@ public <T> URI toUri(T value) {
         },
         UnDecided(null, null),
         OpenDaylight("opendaylight", String.class),
-        TUNGSTEN("tf", String.class);
+        TUNGSTEN("tf", String.class),
+        NSX("nsx", String.class);
 
         private final String scheme;
         private final Class<?> type;
 
@@ -79,20 +79,24 @@ public interface NetworkGuru extends Adapter {
      * be used to make determination can be isolation methods, services
      * provided on the guest network and the service provider that's on the
      * guest network.
-     *
+     * <p>
      * If a network is already fully substantiated with the necessary resources
      * during this design phase, then the state should be set to Setup.  If
      * the resources are not allocated at this point, the state should be set
      * to Allocated.
      *
-     * @param offering network offering that contains the package of services
-     *                 the end user intends to use on that network.
-     * @param plan where is this network being deployed.
+     * @param offering      network offering that contains the package of services
+     *                      the end user intends to use on that network.
+     * @param plan          where is this network being deployed.
      * @param userSpecified user specified parameters for this network.
-     * @param owner owner of this network.
+     * @param name
+     * @param vpcId
+     * @param owner         owner of this network.
      * @return Network
      */
-    Network design(NetworkOffering offering, DeploymentPlan plan, Network userSpecified, Account owner);
+    Network design(NetworkOffering offering, DeploymentPlan plan, Network userSpecified, String name, Long vpcId, Account owner);
+
+    void setup(Network network, long networkId);
 
     /**
      * For guest networks that are in Allocated state after the design stage,
 
@@ -0,0 +1,34 @@
+// 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.nsx;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface NsxProvider extends InternalIdentity, Identity {
+    String getHostname();
+
+    String getPort();
+    String getProviderName();
+    String getUsername();
+    long getZoneId();
+
+    String getTier0Gateway();
+    String getEdgeCluster();
+
+    String getTransportZone();
+}
@@ -0,0 +1,26 @@
+// 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.nsx;
+
+import com.cloud.network.IpAddress;
+import com.cloud.network.vpc.Vpc;
+
+public interface NsxService {
+
+    boolean createVpcNetwork(Long zoneId, long accountId, long domainId, Long vpcId, String vpcName, boolean sourceNatEnabled);
+    boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address);
+}
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,5 @@`
`22`	`22`	`public interface KubernetesClusterHelper extends Adapter {`
`23`	`23`
`24`	`24`	`ControlledEntity findByUuid(String uuid);`
	`25`	`+ ControlledEntity findByVmId(long vmId);`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,4 +97,6 @@ enum Purpose {`
`97`	`97`
`98`	`98`	`void setRuleState(State ruleState);`
`99`	`99`
	`100`	`+ boolean isForSystemVms();`
	`101`	`+`
`100`	`102`	`}`