Merge branch 'sol004-7-renamed' into 'master'

Rename ids, files and folders in SOL004 and SOL007 packages

See merge request !177

charm-packages/SOL004_k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.mf → charm-packages/sol004_k8s_proxy_charm_vnf/sol004_k8s_proxy_charm_vnfd.mf

 
-vnfd_id: k8s_proxy_charm-vnf
-vnfd_product_name: k8s_proxy_charm-vnf
+vnfd_id: sol004_k8s_proxy_charm-vnf
+vnfd_product_name: sol004_k8s_proxy_charm-vnf
 vnfd_provider_id: OSM
 vnfd_software_version: 1.0
 vnfd_package_version: 1.0.0
@@ -356,7 +356,7 @@ Source: Scripts/charms/simple/mod/operator/ops/lib/__init__.py
 Algorithm: SHA-512
 Hash: 5dd21c89546ce53b877d3a75d2148d877b95f5116beb6f6031e509fa3a843ea9a1df85e407abc6651dbb173c0a67a1f84342aae1c2e49ea433f8385325f01988
 
-Source: k8s_proxy_charm_vnfd.yaml
+Source: sol004_k8s_proxy_charm_vnfd.yaml
 Algorithm: SHA-512
-Hash: f7421654c21292146a7be04b38e2a931339795e167cbb5a64f1ab67a7b29b67902d8222b3c81dcb02a510d5577d5f6094e9d34901d4c2722e57b6048e4ec871d
+Hash: ca58d9599ba25012b16f3dcde9f9cae1595303b5d44745cecf8b4ce89f351da43cd4d04d33aaa83b64631bf68938ccbc86ef892fef415238d68849390f5a669f
 

charm-packages/SOL004_k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml → charm-packages/sol004_k8s_proxy_charm_vnf/sol004_k8s_proxy_charm_vnfd.yaml

@@ -30,7 +30,7 @@ vnfd:
             juju:
               charm: simple
               cloud: k8s
-          id: k8s_proxy_charm-vnf
+          id: sol004_k8s_proxy_charm-vnf
           initial-config-primitive:
           - name: config
             execution-environment-ref: simple-ee
@@ -58,9 +58,9 @@ vnfd:
     int-cpd:
       cpd: dataVM-xe0-int
       vdu-id: mgmtVM
-  id: k8s_proxy_charm-vnf
+  id: sol004_k8s_proxy_charm-vnf
   mgmt-cp: vnf-mgmt-ext
-  product-name: k8s_proxy_charm-vnf
+  product-name: sol004_k8s_proxy_charm-vnf
   sw-image-desc:
   - id: ubuntu18.04
     image: ubuntu18.04

charm-packages/SOL007_k8s_proxy_charm_ns/k8s_proxy_charm_nsd.mf → charm-packages/sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.mf

@@ -6,7 +6,7 @@ nsd_file_structure_version: 1.0
 nsd_release_date_time: 2021-11-09T17:51:14.904155-03:00
 compatible_specification_versions: 3.3.1
 
-Source: k8s_proxy_charm_nsd.yaml
+Source: sol007_k8s_proxy_charm_nsd.yaml
 Algorithm: SHA-512
-Hash: 47baf150e903562c0790ed4594ace33afffd84efc99b28aae3f9672805b58eb0b083546360f0e458da83d2e593a895448a391b59af1e3c8c8a913f4e57bb87f3
+Hash: 0c956a90c8efbac8bce96538003e1e4915aa3108fe00c42cbe5a7205dc1edbf7c545679add422142ac563fb1fc5e8943c6e366d781849113f5d3cdc5a0f97339
 

charm-packages/SOL007_k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml → charm-packages/sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.yaml

@@ -14,7 +14,7 @@ nsd:
           - constituent-base-element-id: '1'
             constituent-cpd-id: vnf-data-ext
           virtual-link-profile-id: datanet
-        vnfd-id: k8s_proxy_charm-vnf
+        vnfd-id: sol004_k8s_proxy_charm-vnf
       - id: '2'
         virtual-link-connectivity:
         - constituent-cpd-id:
@@ -25,13 +25,13 @@ nsd:
           - constituent-base-element-id: '2'
             constituent-cpd-id: vnf-data-ext
           virtual-link-profile-id: datanet
-        vnfd-id: k8s_proxy_charm-vnf
-    id: k8s_proxy_charm-ns
-    name: k8s_proxy_charm-ns
+        vnfd-id: sol004_k8s_proxy_charm-vnf
+    id: sol007_k8s_proxy_charm-ns
+    name: sol007_k8s_proxy_charm-ns
     version: '1.0'
     virtual-link-desc:
     - id: mgmtnet
       mgmt-network: 'true'
     - id: datanet
     vnfd-id:
-    - k8s_proxy_charm-vnf
+    - sol004_k8s_proxy_charm-vnf

SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.mf → sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.mf

 
-vnfd_id: hackfest_basic-vnf
-vnfd_product_name: hackfest_basic-vnf
+vnfd_id: sol004_hackfest_basic-vnf
+vnfd_product_name: sol004_hackfest_basic-vnf
 vnfd_provider_id: OSM
 vnfd_software_version: 1.0
 vnfd_package_version: 1.0.0
@@ -8,7 +8,7 @@ vnfd_release_date_time: 2021-11-09T18:10:22.368088-03:00
 compatible_specification_versions: 3.3.1
 vnfm_info: OSM
 
-Source: hackfest_basic_vnfd.yaml
+Source: sol004_hackfest_basic_vnfd.yaml
 Algorithm: SHA-512
-Hash: 00f939cd8ea49e8dd215ec292c804b2622f1a100e4753e81def28df153186750d23031b8167566194d66459e163e10b2e59aa7b1fd313fcb125850b178a004ac
+Hash: 60e9e7f64730cc0875fc3931a7ba92d9d7b62f28aa210a0ccab9d3df1eb88a404f3b678d6427b2e2aa5169918e5769f253ff74ceb69594b48a2daec350fa15b4