From cacfbdf922a3c739e4e60a79c36834e6438ac89c Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 19 Nov 2021 22:36:10 +0100 Subject: [PATCH] Rename ids, files and folders in SOL004 and SOL007 packages Signed-off-by: garciadeblas --- .gitmodules | 8 +++---- .../hackfest_basic_vnfd.mf | 14 ----------- .../Scripts/charms/simple/mod/charms.osm | 1 - .../Scripts/charms/simple/mod/operator | 1 - .../sol004_k8s_proxy_charm_vnf}/ChangeLog.txt | 0 .../Files/icons/osm.png | Bin .../Licenses/license.lic | 0 .../Scripts/charms/simple/actions.yaml | 0 .../Scripts/charms/simple/config.yaml | 0 .../Scripts/charms/simple/hooks/install | 0 .../Scripts/charms/simple/hooks/start | 0 .../Scripts/charms/simple/hooks/upgrade-charm | 0 .../simple/lib/charms/osm/libansible.py | 0 .../charms/simple/lib/charms/osm/ns.py | 0 .../simple/lib/charms/osm/proxy_cluster.py | 0 .../charms/simple/lib/charms/osm/sshproxy.py | 0 .../Scripts/charms/simple/lib/ops/__init__.py | 0 .../Scripts/charms/simple/lib/ops/charm.py | 0 .../charms/simple/lib/ops/framework.py | 0 .../charms/simple/lib/ops/jujuversion.py | 0 .../charms/simple/lib/ops/lib/__init__.py | 0 .../Scripts/charms/simple/lib/ops/log.py | 0 .../Scripts/charms/simple/lib/ops/main.py | 0 .../Scripts/charms/simple/lib/ops/model.py | 0 .../Scripts/charms/simple/lib/ops/storage.py | 0 .../Scripts/charms/simple/lib/ops/testing.py | 0 .../Scripts/charms/simple/lib/ops/version.py | 0 .../Scripts/charms/simple/metadata.yaml | 0 .../Scripts/charms/simple/src/charm.py | 0 .../Scripts/cloud_init/cloud-config.txt | 0 .../sol004_k8s_proxy_charm_vnfd.mf} | 8 +++---- .../sol004_k8s_proxy_charm_vnfd.yaml} | 6 ++--- .../sol007_k8s_proxy_charm_ns}/ChangeLog.txt | 0 .../Files/icons/osm.png | Bin .../Licenses/license.lic | 0 .../sol007_k8s_proxy_charm_nsd.mf} | 4 ++-- .../sol007_k8s_proxy_charm_nsd.yaml} | 10 ++++---- .../ChangeLog.txt | 0 .../Files/icons/osm.png | Bin .../Licenses/license.lic | 0 .../sol004_hackfest_basic_vnfd.mf | 14 +++++++++++ .../sol004_hackfest_basic_vnfd.yaml | 22 +++++++++--------- .../ChangeLog.txt | 0 .../Files/icons/osm.png | Bin .../Licenses/license.lic | 0 .../sol007_hackfest_basic_nsd.mf | 4 ++-- .../sol007_hackfest_basic_nsd.yaml | 8 +++---- 47 files changed, 49 insertions(+), 51 deletions(-) delete mode 100644 SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.mf delete mode 160000 charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/charms.osm delete mode 160000 charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/operator rename {SOL004_hackfest_basic_vnf => charm-packages/sol004_k8s_proxy_charm_vnf}/ChangeLog.txt (100%) rename {SOL004_hackfest_basic_vnf => charm-packages/sol004_k8s_proxy_charm_vnf}/Files/icons/osm.png (100%) rename {SOL004_hackfest_basic_vnf => charm-packages/sol004_k8s_proxy_charm_vnf}/Licenses/license.lic (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/actions.yaml (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/config.yaml (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/hooks/install (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/hooks/start (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/hooks/upgrade-charm (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/charms/osm/libansible.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/charms/osm/ns.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/charms/osm/proxy_cluster.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/charms/osm/sshproxy.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/ops/__init__.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/ops/charm.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/ops/framework.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/ops/jujuversion.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/ops/lib/__init__.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/ops/log.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/ops/main.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/ops/model.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/ops/storage.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/ops/testing.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/lib/ops/version.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/metadata.yaml (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/charms/simple/src/charm.py (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf => sol004_k8s_proxy_charm_vnf}/Scripts/cloud_init/cloud-config.txt (100%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.mf => sol004_k8s_proxy_charm_vnf/sol004_k8s_proxy_charm_vnfd.mf} (98%) rename charm-packages/{SOL004_k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml => sol004_k8s_proxy_charm_vnf/sol004_k8s_proxy_charm_vnfd.yaml} (96%) rename {SOL007_hackfest_basic_ns => charm-packages/sol007_k8s_proxy_charm_ns}/ChangeLog.txt (100%) rename {SOL007_hackfest_basic_ns => charm-packages/sol007_k8s_proxy_charm_ns}/Files/icons/osm.png (100%) rename {SOL007_hackfest_basic_ns => charm-packages/sol007_k8s_proxy_charm_ns}/Licenses/license.lic (100%) rename charm-packages/{SOL007_k8s_proxy_charm_ns/k8s_proxy_charm_nsd.mf => sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.mf} (55%) rename charm-packages/{SOL007_k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml => sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.yaml} (84%) rename {charm-packages/SOL004_k8s_proxy_charm_vnf => sol004_hackfest_basic_vnf}/ChangeLog.txt (100%) rename {charm-packages/SOL004_k8s_proxy_charm_vnf => sol004_hackfest_basic_vnf}/Files/icons/osm.png (100%) rename {charm-packages/SOL004_k8s_proxy_charm_vnf => sol004_hackfest_basic_vnf}/Licenses/license.lic (100%) create mode 100644 sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.mf rename SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.yaml => sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.yaml (74%) rename {charm-packages/SOL007_k8s_proxy_charm_ns => sol007_hackfest_basic_ns}/ChangeLog.txt (100%) rename {charm-packages/SOL007_k8s_proxy_charm_ns => sol007_hackfest_basic_ns}/Files/icons/osm.png (100%) rename {charm-packages/SOL007_k8s_proxy_charm_ns => sol007_hackfest_basic_ns}/Licenses/license.lic (100%) rename SOL007_hackfest_basic_ns/hackfest_basic_nsd.mf => sol007_hackfest_basic_ns/sol007_hackfest_basic_nsd.mf (55%) rename SOL007_hackfest_basic_ns/hackfest_basic_nsd.yaml => sol007_hackfest_basic_ns/sol007_hackfest_basic_nsd.yaml (75%) diff --git a/.gitmodules b/.gitmodules index ce1de377..dfd6f045 100644 --- a/.gitmodules +++ b/.gitmodules @@ -70,9 +70,9 @@ [submodule "charm-packages/native_manual_scale_charm_vnf/charms/simple/mod/operator"] path = charm-packages/native_manual_scale_charm_vnf/charms/simple/mod/operator url = https://github.com/canonical/operator.git -[submodule "charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/operator"] - path = charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/operator +[submodule "charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/operator"] + path = charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/operator url = https://github.com/canonical/operator -[submodule "charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/charms.osm"] - path = charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/charms.osm +[submodule "charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/charms.osm"] + path = charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/charms.osm url = https://github.com/charmed-osm/charms.osm diff --git a/SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.mf b/SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.mf deleted file mode 100644 index e3bca28a..00000000 --- a/SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.mf +++ /dev/null @@ -1,14 +0,0 @@ - -vnfd_id: hackfest_basic-vnf -vnfd_product_name: hackfest_basic-vnf -vnfd_provider_id: OSM -vnfd_software_version: 1.0 -vnfd_package_version: 1.0.0 -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 -Algorithm: SHA-512 -Hash: 00f939cd8ea49e8dd215ec292c804b2622f1a100e4753e81def28df153186750d23031b8167566194d66459e163e10b2e59aa7b1fd313fcb125850b178a004ac - diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/charms.osm b/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/charms.osm deleted file mode 160000 index a7c5b6a8..00000000 --- a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/charms.osm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a7c5b6a8af22d715276125afc3ed26f0436c71af diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/operator b/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/operator deleted file mode 160000 index 824aa2d8..00000000 --- a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/operator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 824aa2d8996ea548c913317c2df6bac258f0737b diff --git a/SOL004_hackfest_basic_vnf/ChangeLog.txt b/charm-packages/sol004_k8s_proxy_charm_vnf/ChangeLog.txt similarity index 100% rename from SOL004_hackfest_basic_vnf/ChangeLog.txt rename to charm-packages/sol004_k8s_proxy_charm_vnf/ChangeLog.txt diff --git a/SOL004_hackfest_basic_vnf/Files/icons/osm.png b/charm-packages/sol004_k8s_proxy_charm_vnf/Files/icons/osm.png similarity index 100% rename from SOL004_hackfest_basic_vnf/Files/icons/osm.png rename to charm-packages/sol004_k8s_proxy_charm_vnf/Files/icons/osm.png diff --git a/SOL004_hackfest_basic_vnf/Licenses/license.lic b/charm-packages/sol004_k8s_proxy_charm_vnf/Licenses/license.lic similarity index 100% rename from SOL004_hackfest_basic_vnf/Licenses/license.lic rename to charm-packages/sol004_k8s_proxy_charm_vnf/Licenses/license.lic diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/actions.yaml b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/actions.yaml similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/actions.yaml rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/actions.yaml diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/config.yaml b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/config.yaml similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/config.yaml rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/config.yaml diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/install b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/install similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/install rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/install diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/start b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/start similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/start rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/start diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/upgrade-charm b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/upgrade-charm similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/upgrade-charm rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/upgrade-charm diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/libansible.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/libansible.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/libansible.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/libansible.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/ns.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/ns.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/ns.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/ns.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/proxy_cluster.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/proxy_cluster.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/proxy_cluster.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/proxy_cluster.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/sshproxy.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/sshproxy.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/sshproxy.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/sshproxy.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/__init__.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/__init__.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/__init__.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/__init__.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/charm.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/charm.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/charm.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/charm.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/framework.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/framework.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/framework.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/framework.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/jujuversion.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/jujuversion.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/jujuversion.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/jujuversion.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/lib/__init__.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/lib/__init__.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/lib/__init__.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/lib/__init__.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/log.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/log.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/log.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/log.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/main.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/main.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/main.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/main.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/model.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/model.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/model.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/model.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/storage.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/storage.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/storage.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/storage.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/testing.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/testing.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/testing.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/testing.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/version.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/version.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/version.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/ops/version.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/metadata.yaml b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/metadata.yaml similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/metadata.yaml rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/metadata.yaml diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/src/charm.py b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/src/charm.py similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/src/charm.py rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/charms/simple/src/charm.py diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/cloud_init/cloud-config.txt b/charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/cloud_init/cloud-config.txt similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/cloud_init/cloud-config.txt rename to charm-packages/sol004_k8s_proxy_charm_vnf/Scripts/cloud_init/cloud-config.txt diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.mf b/charm-packages/sol004_k8s_proxy_charm_vnf/sol004_k8s_proxy_charm_vnfd.mf similarity index 98% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.mf rename to charm-packages/sol004_k8s_proxy_charm_vnf/sol004_k8s_proxy_charm_vnfd.mf index 1a151692..b193ffef 100644 --- a/charm-packages/SOL004_k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.mf +++ b/charm-packages/sol004_k8s_proxy_charm_vnf/sol004_k8s_proxy_charm_vnfd.mf @@ -1,6 +1,6 @@ -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 diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml b/charm-packages/sol004_k8s_proxy_charm_vnf/sol004_k8s_proxy_charm_vnfd.yaml similarity index 96% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml rename to charm-packages/sol004_k8s_proxy_charm_vnf/sol004_k8s_proxy_charm_vnfd.yaml index 01fd67db..fe4935b8 100644 --- a/charm-packages/SOL004_k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml +++ b/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 diff --git a/SOL007_hackfest_basic_ns/ChangeLog.txt b/charm-packages/sol007_k8s_proxy_charm_ns/ChangeLog.txt similarity index 100% rename from SOL007_hackfest_basic_ns/ChangeLog.txt rename to charm-packages/sol007_k8s_proxy_charm_ns/ChangeLog.txt diff --git a/SOL007_hackfest_basic_ns/Files/icons/osm.png b/charm-packages/sol007_k8s_proxy_charm_ns/Files/icons/osm.png similarity index 100% rename from SOL007_hackfest_basic_ns/Files/icons/osm.png rename to charm-packages/sol007_k8s_proxy_charm_ns/Files/icons/osm.png diff --git a/SOL007_hackfest_basic_ns/Licenses/license.lic b/charm-packages/sol007_k8s_proxy_charm_ns/Licenses/license.lic similarity index 100% rename from SOL007_hackfest_basic_ns/Licenses/license.lic rename to charm-packages/sol007_k8s_proxy_charm_ns/Licenses/license.lic diff --git a/charm-packages/SOL007_k8s_proxy_charm_ns/k8s_proxy_charm_nsd.mf b/charm-packages/sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.mf similarity index 55% rename from charm-packages/SOL007_k8s_proxy_charm_ns/k8s_proxy_charm_nsd.mf rename to charm-packages/sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.mf index a5f222fb..124ae25d 100644 --- a/charm-packages/SOL007_k8s_proxy_charm_ns/k8s_proxy_charm_nsd.mf +++ b/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 diff --git a/charm-packages/SOL007_k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml b/charm-packages/sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.yaml similarity index 84% rename from charm-packages/SOL007_k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml rename to charm-packages/sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.yaml index beae3243..d4382cd5 100644 --- a/charm-packages/SOL007_k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml +++ b/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 diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/ChangeLog.txt b/sol004_hackfest_basic_vnf/ChangeLog.txt similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/ChangeLog.txt rename to sol004_hackfest_basic_vnf/ChangeLog.txt diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Files/icons/osm.png b/sol004_hackfest_basic_vnf/Files/icons/osm.png similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Files/icons/osm.png rename to sol004_hackfest_basic_vnf/Files/icons/osm.png diff --git a/charm-packages/SOL004_k8s_proxy_charm_vnf/Licenses/license.lic b/sol004_hackfest_basic_vnf/Licenses/license.lic similarity index 100% rename from charm-packages/SOL004_k8s_proxy_charm_vnf/Licenses/license.lic rename to sol004_hackfest_basic_vnf/Licenses/license.lic diff --git a/sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.mf b/sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.mf new file mode 100644 index 00000000..62c3f78f --- /dev/null +++ b/sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.mf @@ -0,0 +1,14 @@ + +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 +vnfd_release_date_time: 2021-11-09T18:10:22.368088-03:00 +compatible_specification_versions: 3.3.1 +vnfm_info: OSM + +Source: sol004_hackfest_basic_vnfd.yaml +Algorithm: SHA-512 +Hash: 60e9e7f64730cc0875fc3931a7ba92d9d7b62f28aa210a0ccab9d3df1eb88a404f3b678d6427b2e2aa5169918e5769f253ff74ceb69594b48a2daec350fa15b4 + diff --git a/SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.yaml b/sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.yaml similarity index 74% rename from SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.yaml rename to sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.yaml index 4625e424..2d2abd03 100644 --- a/SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.yaml +++ b/sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.yaml @@ -6,18 +6,18 @@ vnfd: - id: default-instantiation-level vdu-level: - number-of-instances: 1 - vdu-id: hackfest_basic-VM + vdu-id: sol004_hackfest_basic-VM vdu-profile: - - id: hackfest_basic-VM + - id: sol004_hackfest_basic-VM min-number-of-instances: 1 ext-cpd: - id: vnf-cp0-ext int-cpd: cpd: vdu-eth0-int - vdu-id: hackfest_basic-VM - id: hackfest_basic-vnf + vdu-id: sol004_hackfest_basic-VM + id: sol004_hackfest_basic-vnf mgmt-cp: vnf-cp0-ext - product-name: hackfest_basic-vnf + product-name: sol004_hackfest_basic-vnf sw-image-desc: - id: ubuntu18.04 name: ubuntu18.04 @@ -35,16 +35,16 @@ vnfd: image: ubuntu-os-cloud:image-family:ubuntu-1804-lts vim-type: gcp vdu: - - id: hackfest_basic-VM - name: hackfest_basic-VM + - id: sol004_hackfest_basic-VM + name: sol004_hackfest_basic-VM sw-image-desc: ubuntu18.04 alternative-sw-image-desc: - ubuntu18.04-aws - ubuntu18.04-azure - ubuntu18.04-gcp - virtual-compute-desc: hackfest_basic-VM-compute + virtual-compute-desc: sol004_hackfest_basic-VM-compute virtual-storage-desc: - - hackfest_basic-VM-storage + - sol004_hackfest_basic-VM-storage int-cpd: - id: vdu-eth0-int virtual-network-interface-requirement: @@ -53,11 +53,11 @@ vnfd: type: PARAVIRT version: '1.0' virtual-compute-desc: - - id: hackfest_basic-VM-compute + - id: sol004_hackfest_basic-VM-compute virtual-cpu: num-virtual-cpu: "1" virtual-memory: size: "1.0" virtual-storage-desc: - - id: hackfest_basic-VM-storage + - id: sol004_hackfest_basic-VM-storage size-of-storage: "10" diff --git a/charm-packages/SOL007_k8s_proxy_charm_ns/ChangeLog.txt b/sol007_hackfest_basic_ns/ChangeLog.txt similarity index 100% rename from charm-packages/SOL007_k8s_proxy_charm_ns/ChangeLog.txt rename to sol007_hackfest_basic_ns/ChangeLog.txt diff --git a/charm-packages/SOL007_k8s_proxy_charm_ns/Files/icons/osm.png b/sol007_hackfest_basic_ns/Files/icons/osm.png similarity index 100% rename from charm-packages/SOL007_k8s_proxy_charm_ns/Files/icons/osm.png rename to sol007_hackfest_basic_ns/Files/icons/osm.png diff --git a/charm-packages/SOL007_k8s_proxy_charm_ns/Licenses/license.lic b/sol007_hackfest_basic_ns/Licenses/license.lic similarity index 100% rename from charm-packages/SOL007_k8s_proxy_charm_ns/Licenses/license.lic rename to sol007_hackfest_basic_ns/Licenses/license.lic diff --git a/SOL007_hackfest_basic_ns/hackfest_basic_nsd.mf b/sol007_hackfest_basic_ns/sol007_hackfest_basic_nsd.mf similarity index 55% rename from SOL007_hackfest_basic_ns/hackfest_basic_nsd.mf rename to sol007_hackfest_basic_ns/sol007_hackfest_basic_nsd.mf index 9fb7bd74..fcb903cf 100644 --- a/SOL007_hackfest_basic_ns/hackfest_basic_nsd.mf +++ b/sol007_hackfest_basic_ns/sol007_hackfest_basic_nsd.mf @@ -6,7 +6,7 @@ nsd_file_structure_version: 1.0 nsd_release_date_time: 2021-11-09T18:10:30.117516-03:00 compatible_specification_versions: 3.3.1 -Source: hackfest_basic_nsd.yaml +Source: sol007_hackfest_basic_nsd.yaml Algorithm: SHA-512 -Hash: 7c46a2da0331a99685e5097a9e5c370dfabfebb4730989582da484f1f98783e6442ba9a8c56b5fb3f5195463d81b6a6a90caacc20eb710b1f4f12c65aac74d33 +Hash: 8b1de6f3f088e6553a61d96a0e44a50ee6fa7b83236d9006087f927c8294c8ba3e17309ba3590e2606ce7f729ccf46639260c3552ea17bddd3e75c4b5214c71d diff --git a/SOL007_hackfest_basic_ns/hackfest_basic_nsd.yaml b/sol007_hackfest_basic_ns/sol007_hackfest_basic_nsd.yaml similarity index 75% rename from SOL007_hackfest_basic_ns/hackfest_basic_nsd.yaml rename to sol007_hackfest_basic_ns/sol007_hackfest_basic_nsd.yaml index be76b264..2736fe11 100644 --- a/SOL007_hackfest_basic_ns/hackfest_basic_nsd.yaml +++ b/sol007_hackfest_basic_ns/sol007_hackfest_basic_nsd.yaml @@ -10,12 +10,12 @@ nsd: - constituent-base-element-id: '1' constituent-cpd-id: vnf-cp0-ext virtual-link-profile-id: mgmtnet - vnfd-id: hackfest_basic-vnf - id: hackfest_basic-ns - name: hackfest_basic-ns + vnfd-id: sol007_hackfest_basic-vnf + id: sol007_hackfest_basic-ns + name: sol007_hackfest_basic-ns version: '1.0' virtual-link-desc: - id: mgmtnet mgmt-network: true vnfd-id: - - hackfest_basic-vnf + - sol007_hackfest_basic-vnf -- GitLab