X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcm-plugins.git;a=blobdiff_plain;f=validators%2Fsrc%2FNetworkingValidation.py;fp=validators%2Fsrc%2FNetworkingValidation.py;h=89b80194adb9689cdd551ce46c904c84ac44750e;hp=a36c9d1bfc20a69dbba3ac9f1149be35a6a2de58;hb=e8deeb0fdaa020920f27a3a0f6a4355808dd11f6;hpb=174629ea1aeb5b719f8bf28f78671119399f391d diff --git a/validators/src/NetworkingValidation.py b/validators/src/NetworkingValidation.py index a36c9d1..89b8019 100644 --- a/validators/src/NetworkingValidation.py +++ b/validators/src/NetworkingValidation.py @@ -40,9 +40,11 @@ class NetworkingValidation(cmvalidator.CMValidator): INFRA_EXTERNAL = 'infra_external' INFRA_INTERNAL = 'infra_internal' INFRA_STORAGE_CLUSTER = 'infra_storage_cluster' + CAAS_OAM = 'caas_oam' INFRA_NETWORKS = [INFRA_EXTERNAL, INFRA_INTERNAL, - INFRA_STORAGE_CLUSTER] + INFRA_STORAGE_CLUSTER, + CAAS_OAM] DNS = 'dns' MTU = 'mtu' @@ -319,6 +321,7 @@ class NetworkingValidation(cmvalidator.CMValidator): self.validate_infra_internal() self.validate_infra_external() self.validate_infra_storage_cluster() + self.validate_caas_oam() self.validate_no_duplicate_infra_vlans() def validate_infra_internal(self): @@ -337,6 +340,15 @@ class NetworkingValidation(cmvalidator.CMValidator): self.validate_infra_network(self.INFRA_STORAGE_CLUSTER) self.validate_no_gateway(self.INFRA_STORAGE_CLUSTER) + def validate_caas_oam(self): + if self.network_exists(self.CAAS_OAM): + self.validate_infra_network(self.CAAS_OAM) + if self.gateway_exists(self.CAAS_OAM): + self.validate_gateway(self.CAAS_OAM) + + def gateway_exists(self, network): + return self.exists_as_dict(self.conf[self.DOMAIN], network, 'gateway') + def validate_infra_network(self, network, vlan_must_exist=False): self.validate_mtu(self.net_conf, network) self.validate_cidr(network)