- docker0_cidr_obj = self.get_docker0_cidr_netw_obj(self.caas_conf[self.DOCKER0_CIDR])
- self.check_docker0_cidr_overlaps_with_netw_subnets(docker0_cidr_obj, props)
+ docker0_cidr_obj = self.get_netw_obj(self.caas_conf[self.DOCKER0_CIDR], self.DOCKER0_CIDR)
+ self.check_cidr_overlaps_with_netw_subnets(docker0_cidr_obj, props, self.DOCKER0_CIDR)
+
+ def validate_oam_cidr(self, props):
+ if not self.caas_utils.is_optional_param_present(self.OAM_CIDR, self.caas_conf):
+ return
+ oam_cidr_obj = self.get_netw_obj(self.caas_conf[self.OAM_CIDR], self.OAM_CIDR)
+ self.check_cidr_overlaps_with_netw_subnets(oam_cidr_obj, props, self.OAM_CIDR)
+ self.check_oam_cidr_prefix(oam_cidr_obj)