diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-09-22 16:47:04 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-09-23 09:43:22 +0200 |
| commit | 5065fe3c82473eb219b10b6f0feb7c83f8f6b3a0 (patch) | |
| tree | e64f41ed6fc4b18f1a1da99fe9ec2cf93ae10b85 | |
| parent | b99904b7a95c387a6284cd042b8e3a429f0fa9e5 (diff) | |
Stop hardcoding ims- as generate_name
Change-Id: I3ea22a4050ff1eb609cffb61edc41c49fab44366
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 3a3bd294ea8101c22896d8601fe2723861f73124)
| -rw-r--r-- | functest_kubernetes/ims/ims.py | 3 | ||||
| -rw-r--r-- | functest_kubernetes/security/security.py | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/functest_kubernetes/ims/ims.py b/functest_kubernetes/ims/ims.py index b3cc79f1..40c581c7 100644 --- a/functest_kubernetes/ims/ims.py +++ b/functest_kubernetes/ims/ims.py @@ -38,6 +38,7 @@ class Vims(testcase.TestCase): # pylint: disable=too-many-instance-attributes metadata_name = "env-vars" test_image_name = "ollivier/clearwater-live-test:hunter" test_container_name = "live-test" + ns_generate_name = "ims-" __logger = logging.getLogger(__name__) @@ -64,7 +65,7 @@ class Vims(testcase.TestCase): # pylint: disable=too-many-instance-attributes """ api_response = self.corev1.create_namespace( client.V1Namespace(metadata=client.V1ObjectMeta( - generate_name="ims-"))) + generate_name=self.ns_generate_name))) self.namespace = api_response.metadata.name self.__logger.debug("create_namespace: %s", api_response) self.zone = '{}.svc.cluster.local'.format(self.namespace) diff --git a/functest_kubernetes/security/security.py b/functest_kubernetes/security/security.py index e590d059..378b2c22 100644 --- a/functest_kubernetes/security/security.py +++ b/functest_kubernetes/security/security.py @@ -46,6 +46,7 @@ class SecurityTesting(testcase.TestCase): self.output_log_name = 'functest-kubernetes.log' self.output_debug_log_name = 'functest-kubernetes.debug.log' self.namespace = "" + self.ns_generate_name = "security-" def deploy_job(self): """Run Security job @@ -56,7 +57,7 @@ class SecurityTesting(testcase.TestCase): assert self.job_name api_response = self.corev1.create_namespace( client.V1Namespace(metadata=client.V1ObjectMeta( - generate_name="ims-"))) + generate_name=self.ns_generate_name))) self.namespace = api_response.metadata.name self.__logger.debug("create_namespace: %s", api_response) with open(pkg_resources.resource_filename( @@ -128,6 +129,7 @@ class KubeHunter(SecurityTesting): def __init__(self, **kwargs): super(KubeHunter, self).__init__(**kwargs) self.job_name = "kube-hunter" + self.ns_generate_name = "kube-hunter-" def process_results(self, **kwargs): """Process kube-hunter details""" @@ -191,6 +193,11 @@ class KubeBench(SecurityTesting): __logger = logging.getLogger(__name__) + def __init__(self, **kwargs): + super(KubeBench, self).__init__(**kwargs) + self.job_name = "kube-bench" + self.ns_generate_name = "kube-bench-" + def run(self, **kwargs): self.job_name = "kube-bench-{}".format(kwargs.get("target", "node")) super(KubeBench, self).run(**kwargs) |