X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vvp%2Fvalidation-scripts.git;a=blobdiff_plain;f=ice_validator%2Ftests%2Fstructures.py;h=a43524662ad033ffbdcefc4aa50da4b08643d65d;hp=0223bc3b671bdf23582f7a56ffe079a421d41f50;hb=c66f5bcac351c595e94046cfe70fd982257b2db3;hpb=3d9c7371509f58e53312e5ded8ac90d292e60c6d diff --git a/ice_validator/tests/structures.py b/ice_validator/tests/structures.py index 0223bc3..a435246 100644 --- a/ice_validator/tests/structures.py +++ b/ice_validator/tests/structures.py @@ -252,15 +252,19 @@ class ContrailV2NetworkFlavorBaseProcessor(HeatProcessor): network_flavor = cls.network_flavor_internal else: p = param.get("get_param") - if isinstance(p, str): - if "_int_" in p or p.startswith("int_"): - network_flavor = cls.network_flavor_internal - elif "_subint_" in p: - network_flavor = cls.network_flavor_subint - else: - network_flavor = cls.network_flavor_external + network_flavor = cls.get_network_format(p) return network_flavor + @classmethod + def get_network_format(cls, param): + if isinstance(param, str): + if "_int_" in param or param.startswith("int_"): + return cls.network_flavor_internal + elif "_subint_" in param: + return cls.network_flavor_subint + else: + return cls.network_flavor_external + class ContrailV2InstanceIpProcessor(ContrailV2NetworkFlavorBaseProcessor): """ ContrailV2 InstanceIp