remove external id when creating network

Author: toni.zamparetti

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

@@ -487,8 +487,6 @@ public void setIp6Address(String ip6Address) {
 
     boolean isStrechedL2Network();
 
-    String getExternalId();
-
     PVlanType getPvlanType();
 
     String getRouterIp();

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

@@ -62,7 +62,6 @@ public class NetworkProfile implements Network {
     private Long networkAclId;
     private final String guruName;
     private boolean strechedL2Subnet;
-    private String externalId;
     private Integer networkCidrSize;
 
     public NetworkProfile(Network network) {
@@ -99,7 +98,6 @@ public NetworkProfile(Network network) {
         strechedL2Subnet = network.isStrechedL2Network();
         isRedundant = network.isRedundant();
         isRollingRestart = network.isRollingRestart();
-        externalId = network.getExternalId();
         networkCidrSize = network.getNetworkCidrSize();
     }
 
@@ -345,11 +343,6 @@ public boolean isStrechedL2Network() {
         return false;
     }
 
-    @Override
-    public String getExternalId() {
-        return externalId;
-    }
-
     @Override
     public PVlanType getPvlanType() {
         return null;

api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java

@@ -145,9 +145,6 @@ public class CreateNetworkCmd extends BaseCmd implements UserCmd {
     @Parameter(name = ApiConstants.IP6_CIDR, type = CommandType.STRING, description = "The CIDR of IPv6 network, must be at least /64")
     private String ip6Cidr;
 
-    @Parameter(name = ApiConstants.EXTERNAL_ID, type = CommandType.STRING, description = "ID of the network in an external system.")
-    private String externalId;
-
     @Parameter(name = ApiConstants.DISPLAY_NETWORK,
                type = CommandType.BOOLEAN,
  description = "An optional field, whether to the display the network to the end User or not.", authorized = {RoleType.Admin})
@@ -271,10 +268,6 @@ public Boolean getDisplayNetwork() {
         return displayNetwork;
     }
 
-    public String getExternalId() {
-        return externalId;
-    }
-
     public String getIsolatedPvlanType() {
         return isolatedPvlanType;
     }

api/src/test/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmdTest.java

@@ -168,13 +168,6 @@ public void testGetDisplayNetwork() {
         Assert.assertEquals(cmd.getDisplayNetwork(), displayNet);
     }
 
-    @Test
-    public void testGetExternalId() {
-        String externalId = "1";
-        ReflectionTestUtils.setField(cmd, "externalId", externalId);
-        Assert.assertEquals(cmd.getExternalId(), externalId);
-    }
-
     @Test
     public void testGetAssociatedNetworkId() {
         Long associatedNetId = 1L;

engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java

@@ -217,12 +217,12 @@ void prepare(VirtualMachineProfile profile, DeployDestination dest, ReservationC
 
     Network createGuestNetwork(long networkOfferingId, String name, String displayText, String gateway, String cidr, String vlanId, boolean bypassVlanOverlapCheck, String networkDomain, Account owner,
                                Long domainId, PhysicalNetwork physicalNetwork, long zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String ip6Gateway, String ip6Cidr,
-                               Boolean displayNetworkEnabled, String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId, String routerIp, String routerIpv6,
+                               Boolean displayNetworkEnabled, String isolatedPvlan, Network.PVlanType isolatedPvlanType, String routerIp, String routerIpv6,
                                String ip4Dns1, String ip4Dns2, String ip6Dns1, String ip6Dns2, Pair<Integer, Integer> vrIfaceMTUs, Integer networkCidrSize) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException;
 
     Network createGuestNetwork(long networkOfferingId, String name, String displayText, String gateway, String cidr, String vlanId, boolean bypassVlanOverlapCheck, String networkDomain, Account owner,
                                Long domainId, PhysicalNetwork physicalNetwork, long zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String ip6Gateway, String ip6Cidr,
-                               Boolean displayNetworkEnabled, String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId, String routerIp, String routerIpv6,
+                               Boolean displayNetworkEnabled, String isolatedPvlan, Network.PVlanType isolatedPvlanType, String routerIp, String routerIpv6,
                                String ip4Dns1, String ip4Dns2, String ip6Dns1, String ip6Dns2, Pair<Integer, Integer> vrIfaceMTUs, Integer networkCidrSize, boolean keepMacAddressOnPublicNic) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException;
 
     UserDataServiceProvider getPasswordResetProvider(Network network);

engine/components-api/src/main/java/com/cloud/network/vpc/VpcManager.java

@@ -131,7 +131,7 @@ public interface VpcManager {
     Network
         createVpcGuestNetwork(long ntwkOffId, String name, String displayText, String gateway, String cidr, String vlanId, String networkDomain, Account owner,
             Long domainId, PhysicalNetwork pNtwk, long zoneId, ACLType aclType, Boolean subdomainAccess, long vpcId, Long aclId, Account caller,
-            Boolean displayNetworkEnabled, String externalId, String ip6Gateway, String ip6Cidr, String ip4Dns1, String ip4Dns2, String ip6Dns1, String ip6Dns2,
+            Boolean displayNetworkEnabled, String ip6Gateway, String ip6Cidr, String ip4Dns1, String ip4Dns2, String ip6Dns1, String ip6Dns2,
             Pair<Integer, Integer> vrIfaceMTUs, Integer networkCidrSize)
             throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException;
 

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

@@ -860,7 +860,7 @@ private static NetworkVO getNetworkVO(long id, final NetworkOffering offering, f
         final NetworkVO vo = new NetworkVO(id, network, offering.getId(), guru.getName(), owner.getDomainId(), owner.getId(),
                 relatedFile, name, displayText, predefined.getNetworkDomain(), offering.getGuestType(),
                 plan.getDataCenterId(), plan.getPhysicalNetworkId(), aclType, offering.isSpecifyIpRanges(),
-                vpcId, offering.isRedundantRouter(), predefined.getExternalId());
+                vpcId, offering.isRedundantRouter());
         vo.setDisplayNetwork(isDisplayNetworkEnabled == null || isDisplayNetworkEnabled);
         vo.setStrechedL2Network(offering.isSupportingStrechedL2());
         vo.setKeepMacAddressOnPublicNic(predefined.getKeepMacAddressOnPublicNic());
@@ -2723,22 +2723,22 @@ public void removeNics(final VirtualMachineProfile vm) {
     public Network createPrivateNetwork(final long networkOfferingId, final String name, final String displayText, final String gateway, final String cidr, final String vlanId, final boolean bypassVlanOverlapCheck, final Account owner, final PhysicalNetwork pNtwk, final Long vpcId) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
         // create network for private gateway
         return createGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId,
-                bypassVlanOverlapCheck, null, owner, null, pNtwk, pNtwk.getDataCenterId(), ACLType.Account, null,
-                vpcId, null, null, true, null, null, null, true, null, null,
-                null, null, null, null, null, null, true);
+                bypassVlanOverlapCheck, null, owner, null, pNtwk, pNtwk.getDataCenterId(),
+                ACLType.Account, null, vpcId, null, null, true, null, null,
+                null, null, null, null, null, null, null, null);
     }
 
     @Override
     @DB
     public Network createGuestNetwork(final long networkOfferingId, final String name, final String displayText, final String gateway, final String cidr, String vlanId,
                                       boolean bypassVlanOverlapCheck, String networkDomain, final Account owner, final Long domainId, final PhysicalNetwork pNtwk,
                                       final long zoneId, final ACLType aclType, Boolean subdomainAccess, final Long vpcId, final String ip6Gateway, final String ip6Cidr,
-                                      final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId,
+                                      final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, Network.PVlanType isolatedPvlanType,
                                       String routerIp, String routerIpv6, String ip4Dns1, String ip4Dns2, String ip6Dns1, String ip6Dns2,
                                       Pair<Integer, Integer> vrIfaceMTUs, Integer networkCidrSize) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
         return createGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId, bypassVlanOverlapCheck,
                 networkDomain, owner, domainId, pNtwk, zoneId, aclType, subdomainAccess, vpcId, ip6Gateway, ip6Cidr,
-                isDisplayNetworkEnabled, isolatedPvlan, isolatedPvlanType, externalId, false, routerIp, routerIpv6,
+                isDisplayNetworkEnabled, isolatedPvlan, isolatedPvlanType, false, routerIp, routerIpv6,
                 ip4Dns1, ip4Dns2, ip6Dns1, ip6Dns2, vrIfaceMTUs, networkCidrSize, true);
     }
 
@@ -2747,21 +2747,21 @@ public Network createGuestNetwork(final long networkOfferingId, final String nam
     public Network createGuestNetwork(final long networkOfferingId, final String name, final String displayText, final String gateway, final String cidr, String vlanId,
                                       boolean bypassVlanOverlapCheck, String networkDomain, final Account owner, final Long domainId, final PhysicalNetwork pNtwk,
                                       final long zoneId, final ACLType aclType, Boolean subdomainAccess, final Long vpcId, final String ip6Gateway, final String ip6Cidr,
-                                      final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId,
+                                      final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, Network.PVlanType isolatedPvlanType,
                                       String routerIp, String routerIpv6, String ip4Dns1, String ip4Dns2, String ip6Dns1, String ip6Dns2,
                                       Pair<Integer, Integer> vrIfaceMTUs, Integer networkCidrSize, boolean keepMacAddressOnPublicNic) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
         // create Isolated/Shared/L2 network
         return createGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId, bypassVlanOverlapCheck,
                 networkDomain, owner, domainId, pNtwk, zoneId, aclType, subdomainAccess, vpcId, ip6Gateway, ip6Cidr,
-                isDisplayNetworkEnabled, isolatedPvlan, isolatedPvlanType, externalId, false, routerIp, routerIpv6,
+                isDisplayNetworkEnabled, isolatedPvlan, isolatedPvlanType, false, routerIp, routerIpv6,
                 ip4Dns1, ip4Dns2, ip6Dns1, ip6Dns2, vrIfaceMTUs, networkCidrSize, keepMacAddressOnPublicNic);
     }
 
     @DB
     private Network createGuestNetwork(final long networkOfferingId, final String name, final String displayText, final String gateway, final String cidr, String vlanId,
                                        boolean bypassVlanOverlapCheck, String networkDomain, final Account owner, final Long domainId, final PhysicalNetwork pNtwk,
                                        final long zoneId, final ACLType aclType, Boolean subdomainAccess, final Long vpcId, final String ip6Gateway, final String ip6Cidr,
-                                       final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId,
+                                       final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, Network.PVlanType isolatedPvlanType,
                                        final Boolean isPrivateNetwork, String routerIp, String routerIpv6, final String ip4Dns1, final String ip4Dns2,
                                        final String ip6Dns1, final String ip6Dns2, Pair<Integer, Integer> vrIfaceMTUs, Integer networkCidrSize,
                                        boolean keepMacAddressOnPublicNic) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
@@ -3030,10 +3030,6 @@ public Network doInTransaction(final TransactionStatus status) {
                         userNetwork.setIp6Gateway(ip6Gateway);
                     }
 
-                    if (externalId != null) {
-                        userNetwork.setExternalId(externalId);
-                    }
-
                     if (StringUtils.isNotBlank(routerIp)) {
                         userNetwork.setRouterIp(routerIp);
                     }

engine/schema/src/main/java/com/cloud/network/dao/NetworkVO.java

@@ -179,9 +179,6 @@ public class NetworkVO implements Network {
     @Column(name = "streched_l2")
     boolean strechedL2Network = false;
 
-    @Column(name = "external_id")
-    String externalId;
-
     @Transient
     String routerIp;
 
@@ -243,7 +240,7 @@ public NetworkVO(TrafficType trafficType, Mode mode, BroadcastDomainType broadca
     }
 
     public NetworkVO(long id, Network that, long offeringId, String guruName, long domainId, long accountId, long related, String name, String displayText,
-            String networkDomain, GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType, boolean specifyIpRanges, Long vpcId, final boolean isRedundant, String externalId) {
+            String networkDomain, GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType, boolean specifyIpRanges, Long vpcId, final boolean isRedundant) {
         this(id,
             that.getTrafficType(),
             that.getMode(),
@@ -287,7 +284,6 @@ public NetworkVO(long id, Network that, long offeringId, String guruName, long d
         if (StringUtils.isNotBlank(that.getIp6Dns2())) {
             this.ip6Dns2 = that.getIp6Dns2();
         }
-        this.externalId = externalId;
         this.publicMtu = that.getPublicMtu();
         this.privateMtu = that.getPrivateMtu();
     }
@@ -705,14 +701,6 @@ public void setVpcId(Long vpcId) {
         this.vpcId = vpcId;
     }
 
-    public String getExternalId() {
-        return externalId;
-    }
-
-    public void setExternalId(String externalId) {
-        this.externalId = externalId;
-    }
-
     public String getVlanIdAsUUID() {
         return vlanIdAsUUID;
     }

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -2836,7 +2836,6 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
             }
             response.setNetworkSpannedZones(networkSpannedZones);
         }
-        response.setExternalId(network.getExternalId());
         response.setRedundantRouter(network.isRedundant());
         response.setCreated(network.getCreated());
         response.setSupportsVmAutoScaling(networkOfferingDao.findByIdIncludingRemoved(network.getNetworkOfferingId()).isSupportsVmAutoScaling());

server/src/main/java/com/cloud/network/IpAddressManagerImpl.java

@@ -2013,7 +2013,7 @@ public Ternary<Boolean, List<NetworkOfferingVO>, Network> doInTransaction(Transa
 
                             guestNetwork = _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), owner.getAccountName() + "-network", owner.getAccountName()
                                     + "-network", null, null, null, false, null, owner, null, physicalNetwork, zoneId, ACLType.Account, null, null, null, null, true, null, null, null, null, null,
-                                    null, null, null, null, null, null);
+                                    null, null, null, null, null);
                             if (guestNetwork == null) {
                                 logger.warn("Failed to create default Virtual network for the account {} in zone {}", owner, zone);
                                 throw new CloudRuntimeException(String.format("Failed to create a" +