Move Sample Kubernetes Driver Directory

The directory structure was changed to accommodate ansible driver.

Implements: blueprint add-ansible-mgmt-driver-sample
Spec: https://review.opendev.org/c/openstack/tacker-specs/+/814689
Change-Id: Id53e5581e3f4cdc6f0bef1d8023ef1fafe91f718

doc/source/user/mgmt_driver_deploy_k8s_and_cnf_with_helm.rst

@@ -539,8 +539,8 @@ Reference
 
 .. _How to use Mgmt Driver for deploying Kubernetes Cluster : https://docs.openstack.org/tacker/latest/user/mgmt_driver_deploy_k8s_usage_guide.html
 .. _Create and Upload VNF Package : https://docs.openstack.org/tacker/latest/user/mgmt_driver_deploy_k8s_usage_guide.html#create-and-upload-vnf-package
-.. _TOSCA.meta : https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/TOSCA-Metadata/TOSCA.meta
-.. _install_helm.sh : https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/install_helm.sh
+.. _TOSCA.meta : https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/TOSCA-Metadata/TOSCA.meta
+.. _install_helm.sh : https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/install_helm.sh
 .. _Deploy Kubernetes Cluster : https://docs.openstack.org/tacker/latest/user/mgmt_driver_deploy_k8s_usage_guide.html#deploy-kubernetes-cluster
 .. _Explanation of the parameters for deploying a Kubernetes cluster : https://docs.openstack.org/tacker/latest/user/mgmt_driver_deploy_k8s_usage_guide.html#single-master-node
 .. _ETSI NFV-SOL CNF (Containerized VNF) Deployment : https://docs.openstack.org/tacker/latest/user/etsi_containerized_vnf_usage_guide.html

doc/source/user/mgmt_driver_deploy_k8s_cir_usage_guide.rst

@@ -36,7 +36,7 @@ The sample structure of VNF Package is shown below.
 .. note::
 
     You can also find them in the
-    `samples/mgmt_driver/private_registry_vnf_package/`_
+    `samples/mgmt_driver/kubernetes/private_registry_vnf_package/`_
     directory of the tacker.
 
 The directory structure:
@@ -722,4 +722,4 @@ Limitations
 .. _NFV-SOL001 v2.6.1 : https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/001/02.06.01_60/gs_NFV-SOL001v020601p.pdf
 .. _NFV-SOL002 v2.6.1 : https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.06.01_60/gs_NFV-SOL002v020601p.pdf
 .. _NFV-SOL003 v2.6.1 : https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.06.01_60/gs_NFV-SOL003v020601p.pdf
-.. _samples/mgmt_driver/private_registry_vnf_package/: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/private_registry_vnf_package/
+.. _samples/mgmt_driver/kubernetes/private_registry_vnf_package/: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/private_registry_vnf_package/

doc/source/user/mgmt_driver_deploy_k8s_kubespary_usage_guide.rst

@@ -158,7 +158,7 @@ The sample structure of VNF Package is shown below.
 .. note::
 
     You can also find them in the
-    `samples/mgmt_driver/kubespray/kubespray_vnf_package/`_
+    `samples/mgmt_driver/kubernetes/kubespray/kubespray_vnf_package/`_
     directory of the tacker.
 
 The directory structure:
@@ -1391,7 +1391,7 @@ The sample structure of this Package is shown below.
 .. note::
 
     You can also find them in the
-    `samples/mgmt_driver/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package`_
+    `samples/mgmt_driver/kubernetes/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package`_
     directory of the tacker.
 
 The directory structure:
@@ -1668,7 +1668,7 @@ Limitations
 .. _Create and Upload VNF Package: https://docs.openstack.org/tacker/latest/user/mgmt_driver_deploy_k8s_usage_guide.html#create-and-upload-vnf-package
 .. _Preparations: https://docs.openstack.org/tacker/latest/user/mgmt_driver_deploy_k8s_usage_guide.html#preparations
 .. _Kubespray's official documentation: https://github.com/kubernetes-sigs/kubespray/#quick-start
-.. _samples/mgmt_driver/kubespray/kubespray_vnf_package/: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubespray/kubespray_vnf_package/
+.. _samples/mgmt_driver/kubernetes/kubespray/kubespray_vnf_package/: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubespray/kubespray_vnf_package/
 .. _Create the Parameter File: https://docs.openstack.org/tacker/latest/user/mgmt_driver_deploy_k8s_usage_guide.html#create-the-parameter-file
 .. _Scale Kubernetes Worker Nodes: https://docs.openstack.org/tacker/latest/user/mgmt_driver_deploy_k8s_usage_guide.html#scale-kubernetes-worker-nodes
 .. _Heal Kubernetes Master/Worker Nodes: https://docs.openstack.org/tacker/latest/user/mgmt_driver_deploy_k8s_usage_guide.html#heal-kubernetes-master-worker-nodes
@@ -1677,4 +1677,4 @@ Limitations
 .. _NFV-SOL003 v2.6.1 : https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.06.01_60/gs_NFV-SOL003v020601p.pdf
 .. _Heat CLI reference : https://docs.openstack.org/python-openstackclient/latest/cli/plugin-commands/heat.html
 .. _Set the value to the request parameter file: https://docs.openstack.org/tacker/latest/user/etsi_containerized_vnf_usage_guide.html#set-the-value-to-the-request-parameter-file
-.. _samples/mgmt_driver/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package
+.. _samples/mgmt_driver/kubernetes/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package

doc/source/user/mgmt_driver_deploy_k8s_usage_guide.rst

@@ -304,7 +304,7 @@ The command is shown below:
 
 .. code-block:: console
 
-    $ wget -P /opt/stack/tacker/samples/mgmt_driver https://cloud-images.ubuntu.com/releases/focal/release/ubuntu-20.04-server-cloudimg-amd64.img
+    $ wget -P /opt/stack/tacker/samples/mgmt_driver/kubernetes https://cloud-images.ubuntu.com/releases/focal/release/ubuntu-20.04-server-cloudimg-amd64.img
 
 2. Install the libguestfs-tools
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -331,7 +331,7 @@ The command is shown below:
 
 .. code-block:: console
 
-    $ cd /opt/stack/tacker/samples/mgmt_driver
+    $ cd /opt/stack/tacker/samples/mgmt_driver/kubernetes
     $ sudo guestfish -a ubuntu-20.04-server-cloudimg-amd64.img -i sh "sed -i 's/lock\_passwd\: True/lock\_passwd\: false/g' /etc/cloud/cloud.cfg"
     $ sudo guestfish -a ubuntu-20.04-server-cloudimg-amd64.img -i sh "sed -i '/[ ][ ][ ][ ][ ]lock\_passwd\: false/a\     plain\_text\_passwd\: ubuntu' /etc/cloud/cloud.cfg"
     $ sudo guestfish -a ubuntu-20.04-server-cloudimg-amd64.img -i sh "sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config"
@@ -349,12 +349,12 @@ The command is shown below:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 First, copy the sample script that was stored in
-``tacker/samples/mgmt_driver/kubernetes_mgmt.py`` into the directory of
-``tacker/tacker/vnfm/mgmt_drivers``.
+``tacker/samples/mgmt_driver/kubernetes/kubernetes_mgmt.py`` into the directory
+of ``tacker/tacker/vnfm/mgmt_drivers``.
 
 .. code-block:: console
 
-    $ cp /opt/stack/tacker/samples/mgmt_driver/kubernetes_mgmt.py /opt/stack/tacker/tacker/vnfm/mgmt_drivers/
+    $ cp /opt/stack/tacker/samples/mgmt_driver/kubernetes/kubernetes_mgmt.py /opt/stack/tacker/tacker/vnfm/mgmt_drivers/
 
 1. Set the setup.cfg
 ~~~~~~~~~~~~~~~~~~~~
@@ -450,7 +450,7 @@ is shown below.
 
 .. note::
 
-    You can also find them in the ``samples/mgmt_driver/kubernetes_vnf_package/`` directory of the tacker.
+    You can also find them in the ``samples/mgmt_driver/kubernetes/kubernetes_vnf_package/`` directory of the tacker.
 
 The directory structure:
 
@@ -2868,21 +2868,21 @@ Reference
 .. _cli-legacy-vim : https://docs.openstack.org/tacker/latest/cli/cli-legacy-vim.html#register-vim
 .. _HAProxy: https://www.haproxy.org/
 .. _Heat CLI reference : https://docs.openstack.org/python-openstackclient/latest/cli/plugin-commands/heat.html
-.. _TOSCA.meta: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/TOSCA-Metadata/TOSCA.meta
-.. _sample_kubernetes_top.vnfd.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/Definitions/sample_kubernetes_top.vnfd.yaml
-.. _sample_kubernetes_types.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/Definitions/sample_kubernetes_types.yaml
-.. _sample_kubernetes_df_simple.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/Definitions/sample_kubernetes_df_simple.yaml
-.. _sample_kubernetes_df_complex.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/Definitions/sample_kubernetes_df_complex.yaml
-.. _sample_kubernetes_df_podaffinity.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/Definitions/sample_kubernetes_df_podaffinity.yaml
-.. _install_k8s_cluster.sh: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/install_k8s_cluster.sh
-.. _kubernetes_mgmt.py: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_mgmt.py
-.. _nested/simple_nested_master.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/BaseHOT/simple/nested/simple_nested_master.yaml
-.. _nested/simple_nested_worker.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/BaseHOT/simple/nested/simple_nested_worker.yaml
-.. _simple_hot_top.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/BaseHOT/simple/simple_hot_top.yaml
-.. _nested/complex_nested_master.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/BaseHOT/complex/nested/complex_nested_master.yaml
-.. _nested/complex_nested_worker.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/BaseHOT/complex/nested/complex_nested_worker.yaml
-.. _complex_hot_top.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/BaseHOT/complex/complex_hot_top.yaml
-.. _nested/podaffinity_nested_master.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/BaseHOT/podaffinity/nested/podaffinity_nested_master.yaml
-.. _nested/podaffinity_nested_worker.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/BaseHOT/podaffinity/nested/podaffinity_nested_worker.yaml
-.. _podaffinity_hot_top.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/BaseHOT/podaffinity/podaffinity_hot_top.yaml
-.. _k8s_cluster_user_data.py: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes_vnf_package/UserData/k8s_cluster_user_data.py
+.. _TOSCA.meta: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/TOSCA-Metadata/TOSCA.meta
+.. _sample_kubernetes_top.vnfd.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/Definitions/sample_kubernetes_top.vnfd.yaml
+.. _sample_kubernetes_types.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/Definitions/sample_kubernetes_types.yaml
+.. _sample_kubernetes_df_simple.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/Definitions/sample_kubernetes_df_simple.yaml
+.. _sample_kubernetes_df_complex.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/Definitions/sample_kubernetes_df_complex.yaml
+.. _sample_kubernetes_df_podaffinity.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/Definitions/sample_kubernetes_df_podaffinity.yaml
+.. _install_k8s_cluster.sh: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/install_k8s_cluster.sh
+.. _kubernetes_mgmt.py: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_mgmt.py
+.. _nested/simple_nested_master.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/BaseHOT/simple/nested/simple_nested_master.yaml
+.. _nested/simple_nested_worker.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/BaseHOT/simple/nested/simple_nested_worker.yaml
+.. _simple_hot_top.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/BaseHOT/simple/simple_hot_top.yaml
+.. _nested/complex_nested_master.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/BaseHOT/complex/nested/complex_nested_master.yaml
+.. _nested/complex_nested_worker.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/BaseHOT/complex/nested/complex_nested_worker.yaml
+.. _complex_hot_top.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/BaseHOT/complex/complex_hot_top.yaml
+.. _nested/podaffinity_nested_master.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/BaseHOT/podaffinity/nested/podaffinity_nested_master.yaml
+.. _nested/podaffinity_nested_worker.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/BaseHOT/podaffinity/nested/podaffinity_nested_worker.yaml
+.. _podaffinity_hot_top.yaml: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/BaseHOT/podaffinity/podaffinity_hot_top.yaml
+.. _k8s_cluster_user_data.py: https://opendev.org/openstack/tacker/src/branch/master/samples/mgmt_driver/kubernetes/kubernetes_vnf_package/UserData/k8s_cluster_user_data.py

samples/mgmt_driver/kubernetes/kubernetes_mgmt.py

@@ -465,7 +465,7 @@ class KubernetesMgmtDriver(vnflcm_abstract_driver.VnflcmMgmtAbstractDriver):
                              "/tmp/install_k8s_cluster.sh")
                     sftp.put(os.path.join(
                         os.path.dirname(os.path.abspath(__file__)),
-                        "../../../samples/mgmt_driver/"
+                        "../../../samples/mgmt_driver/kubernetes/"
                         "create_admin_token.yaml"),
                         "/tmp/create_admin_token.yaml")
                     if helm_inst_script_path:

samples/mgmt_driver/kubernetes/kubespray/kubespray_mgmt.py

@@ -274,7 +274,8 @@ class KubesprayMgmtDriver(vnflcm_abstract_driver.VnflcmMgmtAbstractDriver):
                         fname = 'create_admin_token.yaml'
                         sftp.put(os.path.join(
                             os.path.dirname(os.path.abspath(__file__)),
-                            "../../../samples/mgmt_driver/{}".format(fname)),
+                            ("../../../samples/"
+                            "mgmt_driver/kubernetes/{}".format(fname))),
                             "/tmp/{}".format(fname))
                     connect.close()
                 commander = cmd_executer.RemoteCommandExecutor(