Addressed review comments

Signed-off-by: Marikkannu, Suresh <[email protected]>

Author: sureshmarikkannu

Makefile

@@ -19,7 +19,7 @@ export EXTRA_VARS ?= "@$(5GC_ROOT_DIR)/vars/main.yml"
 
 #### b. Provision k8s ####
 5gc-install: 5gc-router-install 5gc-sriov-install 5gc-core-install
-5gc-uninstall: 5gc-core-uninstall 5gc-sriov-uninstall 5gc-router-uninstall
+5gc-uninstall: 5gc-core-uninstall 5gc-router-uninstall
 
 #### c. Provision router ####
 5gc-router-install:
@@ -33,9 +33,6 @@ export EXTRA_VARS ?= "@$(5GC_ROOT_DIR)/vars/main.yml"
 5gc-sriov-install:
 	ansible-playbook -i $(HOSTS_INI_FILE) $(5GC_ROOT_DIR)/sriov.yml --tags install \
 		--extra-vars "ROOT_DIR=$(ROOT_DIR)" --extra-vars $(EXTRA_VARS)
-5gc-sriov-uninstall:
-	ansible-playbook -i $(HOSTS_INI_FILE) $(5GC_ROOT_DIR)/sriov.yml --tags uninstall \
-		--extra-vars "ROOT_DIR=$(ROOT_DIR)" --extra-vars $(EXTRA_VARS)
 
 #### e. Provision core ####
 5gc-core-install:

roles/core/templates/sdcore-5g-sriov-values.yaml

@@ -110,7 +110,7 @@ omec-sub-provision:
       cfgFiles:
         simapp.yaml:
           configuration:
-            provision-network-slice: {{ core.standalone }} # if enabled, Device Groups & Slices configure by simapp
+            provision-network-slice: {{ core.standalone | string }} # if enabled, Device Groups & Slices configure by simapp
             sub-provision-endpt:
               addr: webui.omec.svc.cluster.local  # subscriber configuation endpoint.
             # sub-proxy-endpt: # used if subscriber proxy is enabled in the ROC.

roles/sriov/tasks/install.yml

@@ -2,7 +2,7 @@
 
 # TODO: running on master node for now (fix to run on multiple nodes)
 
-- name: check VF resources and bind them to vfio-pci
+- name: check VF resources
   block:
     - name: Get number of VF's available for the "{{ core.data_iface }}"
       shell: ip link show "{{ core.data_iface }}" | grep -c vf
@@ -17,57 +17,4 @@
         that:
           - vf_status.stdout | int >= 2
 
-    - name: Get number of VF's attached to vfio-pci driver
-      shell: driverctl -v list-overrides | grep 'vfio-pci' | wc -l
-      register: vf_status
-      changed_when: false
-
-    - debug:
-         var=vf_status.stdout
-
-    - name: verify at least two VF resourses attached to vfio-pci driver
-      ansible.builtin.assert:
-        that:
-          - vf_status.stdout | int >= 2
-
-  when: inventory_hostname in groups['master_nodes'] and core.upf.mode == "dpdk"
-
-- name: deploy sriov plugins
-  block:
-    - name: copy sriov-device-plugin.yaml to /tmp/sriov-device-plugin.yaml
-      template:
-        src: roles/sriov/templates/sriov-device-plugin.yaml
-        dest: "/tmp/sriov-device-plugin.yaml"
-
-    - name: copy sriov-device-plugin-config.yaml to /tmp/sriov-device-plugin-config.yaml
-      template:
-        src: roles/sriov/templates/sriov-device-plugin-config.yaml
-        dest: "/tmp/sriov-device-plugin-config.yaml"
-
-    - name: update proper data interface name in /tmp/sriov-device-plugin-config.yaml
-      shell: sed -i -e "s/PFDEV/{{ core.data_iface }}/g" /tmp/sriov-device-plugin-config.yaml
-
-    - name: apply /tmp/sriov-device-plugin.yaml
-      shell: kubectl apply -f /tmp/sriov-device-plugin.yaml
-
-    - name: apply /tmp/sriov-device-plugin-config.yaml
-      shell: kubectl apply -f /tmp/sriov-device-plugin-config.yaml
-
-    - name: Get Sriov Pods Status
-      shell: kubectl get pods -A | grep sriov
-      register: pod_status
-      changed_when: false
-
-    - name: restart sriov Pod
-      shell: |
-        while IFS= read -r line; do
-          name=$(echo "$line" | awk '{print $2}')
-          status=$(echo "$line" | awk '{print $4}')
-
-          kubectl delete pod "$name"
-        done <<< "{{ pod_status.stdout }}"
-      args:
-        executable: /bin/bash
-    - pause:
-        seconds: 10    
   when: inventory_hostname in groups['master_nodes'] and core.upf.mode == "dpdk"

roles/sriov/tasks/main.yml

@@ -3,7 +3,3 @@
 - name: install 5gc/sriov
   import_tasks: roles/sriov/tasks/install.yml
   tags: install
-
-- name: uninstall 5gc/sriov
-  import_tasks: roles/sriov/tasks/uninstall.yml
-  tags: uninstall