Merge branch 'nsx-integration' of https://github.com/apache/cloudstack into nsx-refactor-update-offering

Author: Pearl1594

api/src/main/java/com/cloud/network/guru/NetworkGuru.java

@@ -96,6 +96,8 @@ public interface NetworkGuru extends Adapter {
      */
     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,
      * resources are allocated when the guest network is actually being used

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -1484,12 +1484,24 @@ public void setVmNetworkDetails(VMInstanceVO vm, VirtualMachineTO vmTO) {
                     Account acc = accountDao.findById(networkVO.getAccountId());
                     Domain domain = domainDao.findById(networkVO.getDomainId());
                     DataCenter zone = _dcDao.findById(vm.getDataCenterId());
-                    String networkName = domain.getName() + "-" + acc.getAccountName() + "-" + zone.getName() + "-";
+                    if (Objects.isNull(zone)) {
+                        throw new CloudRuntimeException(String.format("Failed to find zone with ID: %s", vm.getDataCenterId()));
+                    }
+                    if (Objects.isNull(acc)) {
+                        throw new CloudRuntimeException(String.format("Failed to find account with ID: %s", networkVO.getAccountId()));
+                    }
+                    if (Objects.isNull(domain)) {
+                        throw new CloudRuntimeException(String.format("Failed to find domain with ID: %s", networkVO.getDomainId()));
+                    }
+                    String networkName = String.format("D%s-A%s-Z%s", domain.getId(), acc.getId(), zone.getId());
                     if (Objects.isNull(networkVO.getVpcId())) {
-                        networkName += networkVO.getName();
+                        networkName += "-S"+networkVO.getId();
                     } else {
                         VpcVO vpc = vpcDao.findById(networkVO.getVpcId());
-                        networkName += (vpc.getName() + "-" + networkVO.getName());
+                        if (Objects.isNull(vpc)) {
+                            throw new CloudRuntimeException(String.format("Failed to find VPC with ID: %s", networkVO.getVpcId()));
+                        }
+                        networkName = String.format("%s-V%s-S%s", networkName, vpc.getId(), networkVO.getId());
                     }
                     networkToNetworkNameMap.put(networkVO.getId(), networkName);
                 }

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

@@ -812,6 +812,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
                         }
                     }
                 });
+                guru.setup(network, relatedFile);
             }
 
             if (networks.size() < 1) {

engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java

@@ -926,12 +926,12 @@ public void checkIfVmNetworkDetailsReturnedIsCorrect() {
 
         VirtualMachineTO vmTO = new VirtualMachineTO() {};
         UserVmJoinVO userVm = new UserVmJoinVO();
-        NetworkVO networkVO = new NetworkVO();
-        AccountVO accountVO = new AccountVO();
-        DomainVO domainVO = new DomainVO();
+        NetworkVO networkVO = mock(NetworkVO.class);
+        AccountVO accountVO = mock(AccountVO.class);
+        DomainVO domainVO = mock(DomainVO.class);
         domainVO.setName("testDomain");
         DataCenterVO dataCenterVO = mock(DataCenterVO.class);
-        VpcVO vpcVO = new VpcVO();
+        VpcVO vpcVO = mock(VpcVO.class);
 
         networkVO.setAccountId(1L);
         networkVO.setName("testNet");
@@ -949,9 +949,13 @@ public void checkIfVmNetworkDetailsReturnedIsCorrect() {
         Mockito.when(domainDao.findById(anyLong())).thenReturn(domainVO);
         Mockito.when(dcDao.findById(anyLong())).thenReturn(dataCenterVO);
         Mockito.when(vpcDao.findById(anyLong())).thenReturn(vpcVO);
-        Mockito.when(dataCenterVO.getName()).thenReturn("testZone");
+        Mockito.when(dataCenterVO.getId()).thenReturn(1L);
+        when(accountVO.getId()).thenReturn(2L);
+        Mockito.when(domainVO.getId()).thenReturn(3L);
+        Mockito.when(vpcVO.getId()).thenReturn(4L);
+        Mockito.when(networkVO.getId()).thenReturn(5L);
         virtualMachineManagerImpl.setVmNetworkDetails(vm, vmTO);
         assertEquals(vmTO.getNetworkIdToNetworkNameMap().size(), 1);
-        assertEquals(vmTO.getNetworkIdToNetworkNameMap().get(0L), "testDomain-testAcc-testZone-VPC1-testNet");
+        assertEquals(vmTO.getNetworkIdToNetworkNameMap().get(5L), "D3-A2-Z1-V4-S5");
     }
 }

plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailGuru.java

@@ -138,6 +138,11 @@ public Network design(NetworkOffering offering, DeploymentPlan plan, Network use
         return network;
     }
 
+    @Override
+    public void setup(Network network, long networkId) {
+        // do nothing
+    }
+
     @Override
     public Network implement(Network network, NetworkOffering offering, DeployDestination destination, ReservationContext context)
             throws InsufficientVirtualNetworkCapacityException {

plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxDhcpRelayConfigCommand.java

@@ -20,22 +20,35 @@
 
 public class CreateNsxDhcpRelayConfigCommand extends NsxCommand {
 
+    private Long vpcId;
     private String vpcName;
+    private long networkId;
     private String networkName;
     private List<String> addresses;
 
-    public CreateNsxDhcpRelayConfigCommand(String domainName, String accountName, String zoneName,
-                                           String vpcName, String networkName, List<String> addresses) {
-        super(domainName, accountName, zoneName);
+    public CreateNsxDhcpRelayConfigCommand(long domainId, long accountId, long zoneId,
+                                           Long vpcId, String vpcName, long networkId, String networkName,
+                                           List<String> addresses) {
+        super(domainId, accountId, zoneId);
+        this.vpcId = vpcId;
         this.vpcName = vpcName;
+        this.networkId = networkId;
         this.networkName = networkName;
         this.addresses = addresses;
     }
 
+    public Long getVpcId() {
+        return vpcId;
+    }
+
     public String getVpcName() {
         return vpcName;
     }
 
+    public long getNetworkId() {
+        return networkId;
+    }
+
     public String getNetworkName() {
         return networkName;
     }

plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxSegmentCommand.java

@@ -20,24 +20,37 @@
 
 public class CreateNsxSegmentCommand extends NsxCommand {
 
+    private Long vpcId;
     private String vpcName;
+    private long networkId;
     private String networkName;
     private String networkGateway;
     private String networkCidr;
 
-    public CreateNsxSegmentCommand(String domainName, String accountName, String zoneName,
-                                   String vpcName, String networkName, String networkGateway, String networkCidr) {
-        super(domainName, accountName, zoneName);
+    public CreateNsxSegmentCommand(long domainId, long accountId, long zoneId,
+                                   Long vpcId, String vpcName, long networkId, String networkName,
+                                   String networkGateway, String networkCidr) {
+        super(domainId, accountId, zoneId);
+        this.vpcId = vpcId;
         this.vpcName = vpcName;
+        this.networkId = networkId;
         this.networkName = networkName;
         this.networkGateway = networkGateway;
         this.networkCidr = networkCidr;
     }
 
+    public Long getVpcId() {
+        return vpcId;
+    }
+
     public String getVpcName() {
         return vpcName;
     }
 
+    public long getNetworkId() {
+        return networkId;
+    }
+
     public String getNetworkName() {
         return networkName;
     }

plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxTier1GatewayCommand.java

@@ -19,13 +19,19 @@
 import java.util.Objects;
 
 public class CreateNsxTier1GatewayCommand extends NsxCommand {
+    private long vpcId;
     private String vpcName;
 
-    public CreateNsxTier1GatewayCommand(String domainName, String accountName, String zoneName, String vpcName) {
-        super(domainName, accountName, zoneName);
+    public CreateNsxTier1GatewayCommand(long domainId, long accountId, long zoneId, long vpcId, String vpcName) {
+        super(domainId, accountId, zoneId);
+        this.vpcId = vpcId;
         this.vpcName = vpcName;
     }
 
+    public long getVpcId() {
+        return vpcId;
+    }
+
     public String getVpcName() {
         return vpcName;
     }

plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxSegmentCommand.java

@@ -18,19 +18,33 @@
 
 public class DeleteNsxSegmentCommand extends NsxCommand {
 
+    private Long vpcId;
     private String vpcName;
+
+    private long networkId;
     private String networkName;
 
-    public DeleteNsxSegmentCommand(String domainName, String accountName, String zoneName, String vpcName, String networkName) {
-        super(domainName, accountName, zoneName);
+    public DeleteNsxSegmentCommand(long domainId, long accountId, long zoneId, Long vpcId,
+                                   String vpcName, long networkId, String networkName) {
+        super(domainId, accountId, zoneId);
+        this.vpcId = vpcId;
         this.vpcName = vpcName;
+        this.networkId = networkId;
         this.networkName = networkName;
     }
 
+    public Long getVpcId() {
+        return vpcId;
+    }
+
     public String getVpcName() {
         return vpcName;
     }
 
+    public long getNetworkId() {
+        return networkId;
+    }
+
     public String getNetworkName() {
         return networkName;
     }

plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxTier1GatewayCommand.java

@@ -18,13 +18,19 @@
 
 public class DeleteNsxTier1GatewayCommand extends NsxCommand {
 
+    private Long vpcId;
     private String vpcName;
 
-    public DeleteNsxTier1GatewayCommand(String domainName, String accountName, String zoneName, String vpcName) {
-        super(domainName, accountName, zoneName);
+    public DeleteNsxTier1GatewayCommand(long domainId, long accountId, long zoneId, Long vpcId, String vpcName) {
+        super(domainId, accountId, zoneId);
+        this.vpcId = vpcId;
         this.vpcName = vpcName;
     }
 
+    public Long getVpcId() {
+        return vpcId;
+    }
+
     public String getVpcName() {
         return vpcName;
     }