rename connector to delimiter and add configKey.Category.Network

Author: abh1sar

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

@@ -42,15 +42,15 @@
 public interface VpcManager {
     ConfigKey<Boolean> VpcTierNamePrepend = new ConfigKey<>(Boolean.class,
             "vpc.tier.name.prepend",
-            "Advanced",
+            ConfigKey.CATEGORY_NETWORK,
             "false",
             "Whether to prepend the VPC name to the VPC tier network name",
             true,
             ConfigKey.Scope.Global,
             null);
     ConfigKey<String> VpcTierNamePrependDelimiter = new ConfigKey<>(String.class,
             "vpc.tier.name.prepend.delimiter",
-            "Advanced",
+            ConfigKey.CATEGORY_NETWORK,
             " ",
             "Delimiter string to use between the VPC and the VPC tier name",
             true,

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

@@ -1789,12 +1789,11 @@ public Network createGuestNetwork(CreateNetworkCmd cmd) throws InsufficientCapac
         checkNetworkDns(ipv6, ntwkOff, vpcId, ip4Dns1, ip4Dns2, ip6Dns1, ip6Dns2);
 
         if (vpcId != null && VpcManager.VpcTierNamePrepend.value()) {
-            final String connector = VpcManager.VpcTierNamePrependDelimiter.value();
+            final String delimiter = VpcManager.VpcTierNamePrependDelimiter.value();
             Vpc vpc = _vpcDao.findById(vpcId);
-            if (vpc == null) {
-                throw new CloudRuntimeException(String.format("VPC with id %s not found", vpcId));
+            if (vpc != null) {
+                name = vpc.getName() + delimiter + name;
             }
-            name = vpc.getName() + connector + name;
         }
 
         Network network = commitNetwork(networkOfferingId, gateway, startIP, endIP, netmask, networkDomain, vlanId, bypassVlanOverlapCheck, name, displayText, caller, physicalNetworkId, zone.getId(),