diff options
| -rw-r--r-- | ansible/site.gate.yml | 2 | ||||
| -rw-r--r-- | ansible/site.yml | 2 | ||||
| -rw-r--r-- | docker/cnf/Dockerfile | 28 | ||||
| -rw-r--r-- | docker/cnf/testcases.yaml | 6 | ||||
| -rw-r--r-- | functest_kubernetes/cnf_conformance/conformance.py | 20 | ||||
| -rw-r--r-- | setup.cfg | 2 |
6 files changed, 30 insertions, 30 deletions
diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml index 96719d60..68c868c3 100644 --- a/ansible/site.gate.yml +++ b/ansible/site.gate.yml @@ -60,4 +60,4 @@ tests: - k8s_vims - helm_vims - - cnf_conformance + - cnf_testsuite diff --git a/ansible/site.yml b/ansible/site.yml index aec8bb62..27c4e2f3 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -45,4 +45,4 @@ tests: - k8s_vims - helm_vims - - cnf_conformance + - cnf_testsuite diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index 9d37db9b..b27b9846 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-kubernetes-core ARG K8S_TAG=1.22 -ARG CNF_CONFORMANCE_TAG=v0.9.19 +ARG CNF_TESTSUITE_TAG=v0.11.0 ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat && \ @@ -16,20 +16,20 @@ RUN apk --no-cache add --update wget curl libc6-compat && \ chmod +x /usr/local/bin/kubectl /usr/local/bin/helm && \ rm -r /src/helm-$HELM_TAG-linux-$arch.tar.gz /src/linux-$arch && \ case $(uname -m) in x86_64) \ - curl https://github.com/cncf/cnf-conformance/releases/download/$CNF_CONFORMANCE_TAG/cnf-conformance-$CNF_CONFORMANCE_TAG.tar.gz \ - -L --output /src/cnf-conformance-$CNF_CONFORMANCE_TAG.tar.gz && \ - tar zxf /src/cnf-conformance-$CNF_CONFORMANCE_TAG.tar.gz ./cnf-conformance -C /usr/local/bin && \ - chmod +x /usr/local/bin/cnf-conformance && \ - mkdir /src/cnf-conformance && \ - curl -L https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/example-cnfs/coredns/cnf-conformance.yml \ - --output /src/cnf-conformance/cnf-conformance.yml && \ - curl -L https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/points.yml \ - --output /src/cnf-conformance/points.yml && \ - mkdir -p /src/cnf-conformance/spec/fixtures && \ + curl https://github.com/cncf/cnf-testsuite/releases/download/$CNF_TESTSUITE_TAG/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz \ + -L --output /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz && \ + tar zxf /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz ./cnf-testsuite -C /usr/local/bin && \ + chmod +x /usr/local/bin/cnf-testsuite && \ + mkdir /src/cnf-testsuite && \ + curl -L https://raw.githubusercontent.com/cncf/cnf-testsuite/$CNF_TESTSUITE_TAG/example-cnfs/coredns/cnf-conformance.yml \ + --output /src/cnf-testsuite/cnf-conformance.yml && \ + curl -L https://raw.githubusercontent.com/cncf/cnf-testsuite/$CNF_TESTSUITE_TAG/points.yml \ + --output /src/cnf-testsuite/points.yml && \ + mkdir -p /src/cnf-testsuite/spec/fixtures && \ for yml in chaos_network_loss.yml chaos_cpu_hog.yml chaos_container_kill.yml; do \ - curl -L https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/spec/fixtures/$yml \ - --output /src/cnf-conformance/spec/fixtures/$yml; done && \ + curl -L https://raw.githubusercontent.com/cncf/cnf-testsuite/$CNF_TESTSUITE_TAG/spec/fixtures/$yml \ + --output /src/cnf-testsuite/spec/fixtures/$yml; done && \ helm repo add stable https://cncf.gitlab.io/stable && \ - rm /src/cnf-conformance-$CNF_CONFORMANCE_TAG.tar.gz ;; esac + rm /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz ;; esac COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/cnf/testcases.yaml b/docker/cnf/testcases.yaml index 287747dc..98e9a197 100644 --- a/docker/cnf/testcases.yaml +++ b/docker/cnf/testcases.yaml @@ -28,15 +28,15 @@ tiers: run: name: helm_vims - - case_name: cnf_conformance + - case_name: cnf_testsuite project_name: functest criteria: 90 blocking: false description: >- Enable interoperability of Cloud native Network Functions (CNFs) as proposed by - https://github.com/cncf/cnf-conformance + https://github.com/cncf/cnf-testsuite dependencies: - DEPLOY_SCENARIO: "k8-*" run: - name: cnf_conformance + name: cnf_testsuite diff --git a/functest_kubernetes/cnf_conformance/conformance.py b/functest_kubernetes/cnf_conformance/conformance.py index 3bb3170c..1ef42adc 100644 --- a/functest_kubernetes/cnf_conformance/conformance.py +++ b/functest_kubernetes/cnf_conformance/conformance.py @@ -11,7 +11,7 @@ The CNF Conformance program enables interoperability of Cloud native Network Functions (CNFs) from multiple vendors running on top of Kubernetes supplied by different vendors [1]. -[1] https://github.com/cncf/cnf-conformance +[1] https://github.com/cncf/cnf-testsuite """ from __future__ import division @@ -36,7 +36,7 @@ class CNFConformance(testcase.TestCase): https://hackmd.io/@vulk/SkY54QnsU """ - src_dir = '/src/cnf-conformance' + src_dir = '/src/cnf-testsuite' bin_dir = '/usr/local/bin' default_tag = 'workload' @@ -48,10 +48,10 @@ class CNFConformance(testcase.TestCase): self.output_debug_log_name = 'functest-kubernetes.debug.log' def check_requirements(self): - """Check if cnf-conformance is in $PATH""" - if not os.path.exists(os.path.join(self.bin_dir, 'cnf-conformance')): + """Check if cnf-testsuite is in $PATH""" + if not os.path.exists(os.path.join(self.bin_dir, 'cnf-testsuite')): self.__logger.warning( - "cnf-conformance is not compiled for arm and arm64 for the " + "cnf-testsuite is not compiled for arm and arm64 for the " "time being") self.is_skipped = True @@ -70,21 +70,21 @@ class CNFConformance(testcase.TestCase): os.path.join(self.src_dir, 'spec/fixtures', cfile), os.path.join(self.res_dir, 'spec/fixtures', cfile)) os.chdir(self.res_dir) - cmd = ['cnf-conformance', 'setup'] + cmd = ['cnf-testsuite', 'setup'] output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8")) - cmd = ['cnf-conformance', 'cnf_setup', + cmd = ['cnf-testsuite', 'cnf_setup', 'cnf-config=cnf-conformance.yml'] output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8")) def run_conformance(self, **kwargs): """Run CNF Conformance""" - cmd = ['cnf-conformance', kwargs.get("tag", self.default_tag)] + cmd = ['cnf-testsuite', kwargs.get("tag", self.default_tag)] output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8")) lfiles = glob.glob(os.path.join( - self.res_dir, 'results', 'cnf-conformance-results-*.yml')) + self.res_dir, 'results', 'cnf-testsuite-results-*.yml')) results = max(lfiles, key=os.path.getmtime) with open(os.path.join(self.res_dir, 'results', results)) as yfile: self.details = yaml.safe_load(yfile) @@ -112,7 +112,7 @@ class CNFConformance(testcase.TestCase): self.stop_time = time.time() def clean(self): - cmd = ['cnf-conformance', 'cnf_cleanup', + cmd = ['cnf-testsuite', 'cnf_cleanup', 'cnf-config=cnf-conformance.yml'] output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8")) @@ -16,4 +16,4 @@ xtesting.testcase = helm_vims = functest_kubernetes.ims.ims:HelmVims kube_hunter = functest_kubernetes.security.security:KubeHunter kube_bench = functest_kubernetes.security.security:KubeBench - cnf_conformance = functest_kubernetes.cnf_conformance.conformance:CNFConformance + cnf_testsuite = functest_kubernetes.cnf_conformance.conformance:CNFConformance |