Support network-scope settings and add setting to override vr service offering

api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java

@@ -33,6 +33,7 @@
 import org.apache.cloudstack.api.response.ConfigurationResponse;
 import org.apache.cloudstack.api.response.ImageStoreResponse;
 import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.NetworkResponse;
 import org.apache.cloudstack.api.response.StoragePoolResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.config.Configuration;
@@ -103,6 +104,13 @@
     @Parameter(name = ApiConstants.PARENT, type = CommandType.STRING, description = "lists configuration by parent name (primarily used for UI)", since = "4.18.0")
     private String parentName;
 
+    @Parameter(name = ApiConstants.NETWORK_ID,
+               type = CommandType.UUID,
+               entityType = NetworkResponse.class,
+               description = "the ID of the Network to list the parameter value for corresponding network",
+               since = "4.18.0")
+    private Long networkId;
+
     // ///////////////////////////////////////////////////
     // ///////////////// Accessors ///////////////////////
     // ///////////////////////////////////////////////////
@@ -159,6 +167,10 @@
         return super.getPageSize();
     }
 
+    public Long getNetworkId() {
+        return networkId;
+    }
+
     @Override
     public Long getPageSizeVal() {
         Long defaultPageSize = 500L;
@@ -200,6 +212,9 @@
         if (getImageStoreId() != null){
             cfgResponse.setScope("imagestore");
         }
+        if (getNetworkId() != null) {
+            cfgResponse.setScope("network");
+        }
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java

@@ -30,6 +30,7 @@
 import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.ConfigurationResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.NetworkResponse;
 import org.apache.cloudstack.api.response.StoragePoolResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.config.Configuration;
@@ -84,6 +85,13 @@
             description = "the ID of the Image Store to reset the parameter value for corresponding image store")
     private Long imageStoreId;
 
+    @Parameter(name = ApiConstants.NETWORK_ID,
+               type = CommandType.UUID,
+               entityType = NetworkResponse.class,
+               description = "the ID of the Network to reset the parameter value for corresponding network",
+               since = "4.18.0")
+    private Long networkId;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -116,6 +124,10 @@
         return imageStoreId;
     }
 
+    public Long getNetworkId() {
+        return networkId;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
@@ -149,6 +161,9 @@
             if (getImageStoreId() != null) {
                 response.setScope(ConfigKey.Scope.ImageStore.name());
             }
+            if (getNetworkId() != null) {
+                response.setScope(ConfigKey.Scope.Network.name());
+            }
             response.setValue(cfg.second());
             this.setResponseObject(response);
         } else {

api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java

@@ -30,6 +30,7 @@
 import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.ConfigurationResponse;
 import org.apache.cloudstack.api.response.ImageStoreResponse;
+import org.apache.cloudstack.api.response.NetworkResponse;
 import org.apache.cloudstack.api.response.StoragePoolResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.config.Configuration;
@@ -88,6 +89,13 @@
             validations = ApiArgValidator.PositiveNumber)
     private Long imageStoreId;
 
+    @Parameter(name = ApiConstants.NETWORK_ID,
+               type = CommandType.UUID,
+               entityType = NetworkResponse.class,
+               description = "the ID of the Network to update the parameter value for corresponding network",
+               since = "4.18.0")
+    private Long networkId;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -128,6 +136,10 @@
         return imageStoreId;
     }
 
+    public Long getNetworkId() {
+        return networkId;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
@@ -193,6 +205,9 @@
         if (getDomainId() != null) {
             response.setScope("domain");
         }
+        if (getNetworkId() != null) {
+            response.setScope("network");
+        }
         return response;
     }
 }

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

@@ -16,10 +16,24 @@
 // under the License.
 package com.cloud.network.dao;
 
+import java.util.Map;
+import java.util.List;
+
 import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
 
 import com.cloud.utils.db.GenericDao;
 
 public interface NetworkDetailsDao extends GenericDao<NetworkDetailVO, Long>, ResourceDetailsDao<NetworkDetailVO> {
+
     boolean isNetworkUsageHidden(long networkId);
+
+    void persist(long networkId, Map<String, String> details);
+
+    NetworkDetailVO findDetail(long networkId, String name);
+
+    List<NetworkDetailVO> listDetailsByName(String name);
+
+    void deleteDetails(long networkId);
+
+    void update(long networkId, Map<String, String> details);
 }

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

@@ -21,10 +21,31 @@
 
 import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
 
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.ConfigKey.Scope;
+import org.apache.cloudstack.framework.config.ScopedConfigStorage;
+
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.QueryBuilder;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.utils.db.SearchCriteria.Op;
 import com.cloud.network.Network;
 
 @Component
-public class NetworkDetailsDaoImpl extends ResourceDetailsDaoBase<NetworkDetailVO> implements NetworkDetailsDao {
+@DB
+public class NetworkDetailsDaoImpl extends ResourceDetailsDaoBase<NetworkDetailVO> implements NetworkDetailsDao, ScopedConfigStorage {
+    protected final SearchBuilder<NetworkDetailVO> networkSearch;
+
+    protected NetworkDetailsDaoImpl() {
+        networkSearch = createSearchBuilder();
+        networkSearch.and("networkId", networkSearch.entity().getResourceId(), Op.EQ);
+        networkSearch.done();
+    }
 
     @Override
     public void addDetail(long resourceId, String key, String value, boolean display) {
@@ -36,4 +57,62 @@
         NetworkDetailVO networkDetail = findDetail(networkId, Network.hideIpAddressUsage);
         return networkDetail != null && "true".equals(networkDetail.getValue());
     }
+
+    @Override
+    public void persist(long networkId, Map<String, String> details) {
+        try(TransactionLegacy txn = TransactionLegacy.currentTxn()) {
+          txn.start();
+          SearchCriteria<NetworkDetailVO> sc = networkSearch.create();
+          sc.setParameters("networkId", networkId);
+          expunge(sc);
+          for (Map.Entry<String, String> detail : details.entrySet()) {
+            NetworkDetailVO vo = new NetworkDetailVO(networkId, detail.getKey(), detail.getValue(), true);
+            persist(vo);
+          }
+          txn.commit();
+        }
+    }
+
+    @Override
+    public NetworkDetailVO findDetail(long networkId, String name) {
+        QueryBuilder<NetworkDetailVO> sc = QueryBuilder.create(NetworkDetailVO.class);
+        sc.and(sc.entity().getResourceId(), Op.EQ, networkId);
+        sc.and(sc.entity().getName(), Op.EQ, name);
+        return sc.find();
+    }
+
+    @Override
+    public List<NetworkDetailVO> listDetailsByName(String name) {
+        QueryBuilder<NetworkDetailVO> sc = QueryBuilder.create(NetworkDetailVO.class);
+        sc.and(sc.entity().getName(), Op.EQ, name);
+        return sc.list();
+    }
+
+    @Override
+    public void deleteDetails(long networkId) {
+        SearchCriteria<NetworkDetailVO> sc = networkSearch.create();
+        sc.setParameters("networkId", networkId);
+        List<NetworkDetailVO> results = search(sc, null);
+        for (NetworkDetailVO result : results) {
+            remove(result.getId());
+        }
+    }
+
+    @Override
+    public void update(long networkId, Map<String, String> details) {
+        Map<String, String> oldDetails = listDetailsKeyPairs(networkId);
+        oldDetails.putAll(details);
+        persist(networkId, oldDetails);
+    }
+
+    @Override
+    public Scope getScope() {
+        return ConfigKey.Scope.Network;
+    }
+
+    @Override
+    public String getConfigValue(long id, ConfigKey<?> key) {
+        NetworkDetailVO vo = findDetail(id, key.key());
+        return vo == null ? null : vo.getValue();
+    }
 }

framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java

@@ -37,7 +37,7 @@ public class ConfigKey<T> {
     public static final String CATEGORY_NETWORK = "Network";
 
     public enum Scope {
-        Global, Zone, Cluster, StoragePool, Account, ManagementServer, ImageStore, Domain
+        Global, Zone, Cluster, StoragePool, Account, ManagementServer, ImageStore, Domain, Network
     }
 
     public enum Kind {

framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java

@@ -98,14 +98,15 @@ public ConfigDepotImpl() {
      * This map must contain all ConfigKey.Scope values, except the ConfigKey.Scope.Global.
      */
     protected void createEmptyScopeLevelMappings() {
-        _scopeLevelConfigsMap = new HashMap<ConfigKey.Scope, Set<ConfigKey<?>>>();
-        _scopeLevelConfigsMap.put(ConfigKey.Scope.Zone, new HashSet<ConfigKey<?>>());
-        _scopeLevelConfigsMap.put(ConfigKey.Scope.Cluster, new HashSet<ConfigKey<?>>());
-        _scopeLevelConfigsMap.put(ConfigKey.Scope.StoragePool, new HashSet<ConfigKey<?>>());
-        _scopeLevelConfigsMap.put(ConfigKey.Scope.Account, new HashSet<ConfigKey<?>>());
-        _scopeLevelConfigsMap.put(ConfigKey.Scope.ImageStore, new HashSet<ConfigKey<?>>());
-        _scopeLevelConfigsMap.put(ConfigKey.Scope.Domain, new HashSet<ConfigKey<?>>());
-        _scopeLevelConfigsMap.put(ConfigKey.Scope.ManagementServer, new HashSet<ConfigKey<?>>());
+        _scopeLevelConfigsMap = new HashMap<>();
+        _scopeLevelConfigsMap.put(ConfigKey.Scope.Zone, new HashSet<>());
+        _scopeLevelConfigsMap.put(ConfigKey.Scope.Cluster, new HashSet<>());
+        _scopeLevelConfigsMap.put(ConfigKey.Scope.StoragePool, new HashSet<>());
+        _scopeLevelConfigsMap.put(ConfigKey.Scope.Account, new HashSet<>());
+        _scopeLevelConfigsMap.put(ConfigKey.Scope.ImageStore, new HashSet<>());
+        _scopeLevelConfigsMap.put(ConfigKey.Scope.Domain, new HashSet<>());
+        _scopeLevelConfigsMap.put(ConfigKey.Scope.ManagementServer, new HashSet<>());
+        _scopeLevelConfigsMap.put(ConfigKey.Scope.Network, new HashSet<>());
     }
 
     @Override

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

@@ -222,6 +222,7 @@
 import com.cloud.network.dao.LoadBalancerDao;
 import com.cloud.network.dao.LoadBalancerVO;
 import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkDetailsDao;
 import com.cloud.network.dao.NetworkDomainDao;
 import com.cloud.network.dao.NetworkDomainVO;
 import com.cloud.network.dao.NetworkRuleConfigDao;
@@ -426,6 +427,7 @@
     static DomainDetailsDao s_domainDetailsDao;
     static AccountDetailsDao s_accountDetailsDao;
     static NetworkDomainDao s_networkDomainDao;
+    static NetworkDetailsDao s_networkDetailsDao;
     static HighAvailabilityManager s_haMgr;
     static VpcManager s_vpcMgr;
     static TaggedResourceService s_taggedResourceService;
@@ -626,6 +628,8 @@
     @Inject
     private NetworkDomainDao networkDomainDao;
     @Inject
+    private NetworkDetailsDao networkDetailsDao;
+    @Inject
     private HighAvailabilityManager haMgr;
     @Inject
     private VpcManager vpcMgr;
@@ -826,6 +830,7 @@
         s_domainDetailsDao = domainDetailsDao;
         s_accountDetailsDao = accountDetailsDao;
         s_networkDomainDao = networkDomainDao;
+        s_networkDetailsDao = networkDetailsDao;
         s_haMgr = haMgr;
         s_vpcMgr = vpcMgr;
         s_taggedResourceService = taggedResourceService;
@@ -1510,6 +1515,11 @@
         return details.isEmpty() ? null : details;
     }
 
+    public static Map<String, String> getNetworkDetails(long networkId) {
+        Map<String, String> details = s_networkDetailsDao.listDetailsKeyPairs(networkId);
+        return details.isEmpty() ? null : details;
+    }
+
     public static Map<Service, Set<Provider>> listNetworkOfferingServices(long networkOfferingId) {
         return s_networkModel.getNetworkOfferingServiceProvidersMap(networkOfferingId);
     }

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

@@ -2711,6 +2711,7 @@
         }
         response.setBytesReceived(bytesReceived);
         response.setBytesSent(bytesSent);
+        response.setDetails(ApiDBUtils.getNetworkDetails(network.getId()));
 
         if (networkOfferingDao.isIpv6Supported(network.getNetworkOfferingId())) {
             response.setInternetProtocol(networkOfferingDao.getNetworkOfferingInternetProtocol(network.getNetworkOfferingId(), NetUtils.InternetProtocol.IPv4).toString());