X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fconfig-manager.git;a=blobdiff_plain;f=cmdatahandlers%2Fsrc%2Fcmdatahandlers%2Fnetworking%2Fconfig.py;h=b94b62c316a1a420fabae2e4f97a1498ccc747f3;hp=4f724ec01cd618dee71d026182c1e024cbf2bea0;hb=4ce1263147d1bd6106730a9a2ae0d4ed933f8af7;hpb=d819149d39c7f26a15c81f514adc2f9127db37c4

diff --git a/cmdatahandlers/src/cmdatahandlers/networking/config.py b/cmdatahandlers/src/cmdatahandlers/networking/config.py
index 4f724ec..b94b62c 100644
--- a/cmdatahandlers/src/cmdatahandlers/networking/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/networking/config.py
@@ -20,11 +20,19 @@ from serviceprofiles import profiles
 from netaddr import IPNetwork, IPSet, IPRange
 
 
-VALID_NETWORKS = \
-    ['infra_external', 'infra_storage_cluster', 'infra_hw_management', 'infra_internal', 'cloud_tenant', 'infra_access']
+VALID_NETWORKS = [
+    'caas_oam',
+    'cloud_tenant',
+    'infra_access',
+    'infra_external',
+    'infra_internal',
+    'infra_hw_management',
+    'infra_storage_cluster',
+]
 
 NETWORK_DOMAINS = 'network_domains'
 
+
 class Config(config.Config):
     def __init__(self, confman):
         super(Config, self).__init__(confman)
@@ -486,6 +494,19 @@ class Config(config.Config):
         """
         return 'infra_internal'
 
+    @staticmethod
+    def get_caas_oam_network_name():
+        """ get the CaaS OAM network name
+
+            Return:
+
+            The CaaS OAM network name
+
+            Raise:
+
+        """
+        return 'caas_oam'
+
     def get_cloud_tenant_network_name(self):
         """ get the network name for the cloud tenant network
 
@@ -560,6 +581,12 @@ class Config(config.Config):
             except configerror.ConfigError:
                 pass
 
+            try:
+                cidr = self.get_network_cidr(network, domain)
+                networkdata['cidr'] = cidr
+            except configerror.ConfigError:
+                pass
+
             key = host + '.' + self.DOMAIN
             if key not in self.config:
                 self.config[key] = {}
@@ -654,13 +681,11 @@ class Config(config.Config):
 
         return self.config[hostnetconfigkey][network]['mask']
 
-
     def get_external_vip(self):
         """ get the external vip ip, this is always the first ip in the range
         """
         return self.external_vip
 
-
     def get_provider_networks(self):
         """
         Get provider network names
@@ -718,7 +743,6 @@ class Config(config.Config):
 
         return self.config[self.ROOT]['provider_networks'][network]['vlan_ranges']
 
-
     def get_provider_network_mtu(self, network):
         """
         Get mtu for the given provider network