Merge "Fix oidc's vim not applied to FT"

roles/setup-default-vim/tasks/main.yaml

@@ -264,8 +264,8 @@
   - name: Replace the config file path in the test-setup-k8s-vim.sh
     replace:
        path: "{{ zuul_work_dir }}/tools/test-setup-k8s-vim.sh"
-       regexp: '(?<=config-file )([^ ]+)(?= )'
-       replace: "{{ ansible_env.HOME }}/{{ zuul_work_dir }}/tacker/tests/etc/samples/local-k8s-vim.yaml"
+       regexp: '(?<=conf_dir=)([^\n]+)(?=\n)'
+       replace: "{{ ansible_env.HOME }}/{{ zuul_work_dir }}/tacker/tests/etc/samples"
 
   - name: Run tools/test-setup-k8s-vim.sh
     command: tools/test-setup-k8s-vim.sh

tacker/tests/functional/sol_kubernetes_oidc_auth/vnflcm_v1/test_kubernetes_oidc_auth.py

@@ -31,6 +31,18 @@ class VnfLcmKubernetesOidcTest(base.BaseVnfLcmKubernetesTest):
     def tearDownClass(cls):
         super(VnfLcmKubernetesOidcTest, cls).tearDownClass()
 
+    def setUp(self):
+        vim_list = self.client.list_vims()
+        if not vim_list:
+            self.skipTest("Vims are not configured")
+
+        vim_name = 'vim-kubernetes-oidc-auth'
+        vim = self.get_vim(vim_list, vim_name)
+        if not vim:
+            self.skipTest(f"Kubernetes VIM '{vim_name}' is missing")
+        self.vim_id = vim['id']
+        self.extra = vim['extra']
+
     def test_basic_lcmsV1_with_oidc_auth(self):
         """Test CNF LCM with OIDC auth
 

tools/test-setup-k8s-vim.sh

@@ -34,7 +34,7 @@ register_vim() {
 register_vim $conf_dir/local-k8s-vim.yaml vim-kubernetes
 
 # regiter vim with OpenID Connect info
-if [ -f $conf_dir/local-k8s-vim-oidc.yaml ]
+if [ -f /tmp/keycloak.crt ]
 then
     register_vim $conf_dir/local-k8s-vim-oidc.yaml vim-kubernetes-oidc
-fi
+fi