From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 20 Jan 2025 09:49:59 +0000 (+0100)
Subject: Fix the cnf-testsuite calls
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9e925d9b2eeb95fa1a4720f006f27966ce34f90c;p=functest-kubernetes.git

Fix the cnf-testsuite calls

It takes [1] into account

[1] https://github.com/cnti-testcatalog/testsuite/commit/bb1634895c6f9f119cdd3e543d3e110b08227c19

Change-Id: I96e625a14b5440fd9a039f5b87a22904a6444e8b
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 7f1edb33f27d20e0d28fd9b391ccd333cd1bd032)
---

diff --git a/functest_kubernetes/cnf_conformance/conformance.py b/functest_kubernetes/cnf_conformance/conformance.py
index d1e4bcf1..22cdbff6 100644
--- a/functest_kubernetes/cnf_conformance/conformance.py
+++ b/functest_kubernetes/cnf_conformance/conformance.py
@@ -95,7 +95,7 @@ class CNFConformance(testcase.TestCase):
             self.result = 0
             return False
         self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
-        cmd = ['cnf-testsuite', 'cnf_setup',
+        cmd = ['cnf-testsuite', 'cnf_install',
                'cnf-config=cnf-testsuite.yml', '-l', 'debug']
         try:
             output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
@@ -155,7 +155,7 @@ class CNFConformance(testcase.TestCase):
         self.stop_time = time.time()
 
     def clean(self):
-        for clean_cmd in ['cnf_cleanup']:
+        for clean_cmd in ['cnf_uninstall']:
             cmd = ['cnf-testsuite', clean_cmd,
                    'cnf-config=cnf-testsuite.yml']
             output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)