diff --git a/magma/hackfest_squid_cnf/charms/squid/README.md b/magma/squid_cnf/charms/squid/README.md similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/README.md rename to magma/squid_cnf/charms/squid/README.md diff --git a/magma/hackfest_squid_cnf/charms/squid/actions.yaml b/magma/squid_cnf/charms/squid/actions.yaml similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/actions.yaml rename to magma/squid_cnf/charms/squid/actions.yaml diff --git a/magma/hackfest_squid_cnf/charms/squid/actions/addurl b/magma/squid_cnf/charms/squid/actions/addurl similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/actions/addurl rename to magma/squid_cnf/charms/squid/actions/addurl diff --git a/magma/hackfest_squid_cnf/charms/squid/config.yaml b/magma/squid_cnf/charms/squid/config.yaml similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/config.yaml rename to magma/squid_cnf/charms/squid/config.yaml diff --git a/magma/hackfest_squid_cnf/charms/squid/hooks/install b/magma/squid_cnf/charms/squid/hooks/install similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/hooks/install rename to magma/squid_cnf/charms/squid/hooks/install diff --git a/magma/hackfest_squid_cnf/charms/squid/lib/.empty b/magma/squid_cnf/charms/squid/lib/.empty similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/lib/.empty rename to magma/squid_cnf/charms/squid/lib/.empty diff --git a/magma/hackfest_squid_cnf/charms/squid/lib/ops/__init__.py b/magma/squid_cnf/charms/squid/lib/ops/__init__.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/lib/ops/__init__.py rename to magma/squid_cnf/charms/squid/lib/ops/__init__.py diff --git a/magma/hackfest_squid_cnf/charms/squid/lib/ops/charm.py b/magma/squid_cnf/charms/squid/lib/ops/charm.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/lib/ops/charm.py rename to magma/squid_cnf/charms/squid/lib/ops/charm.py diff --git a/magma/hackfest_squid_cnf/charms/squid/lib/ops/framework.py b/magma/squid_cnf/charms/squid/lib/ops/framework.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/lib/ops/framework.py rename to magma/squid_cnf/charms/squid/lib/ops/framework.py diff --git a/magma/hackfest_squid_cnf/charms/squid/lib/ops/jujuversion.py b/magma/squid_cnf/charms/squid/lib/ops/jujuversion.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/lib/ops/jujuversion.py rename to magma/squid_cnf/charms/squid/lib/ops/jujuversion.py diff --git a/magma/hackfest_squid_cnf/charms/squid/lib/ops/log.py b/magma/squid_cnf/charms/squid/lib/ops/log.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/lib/ops/log.py rename to magma/squid_cnf/charms/squid/lib/ops/log.py diff --git a/magma/hackfest_squid_cnf/charms/squid/lib/ops/main.py b/magma/squid_cnf/charms/squid/lib/ops/main.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/lib/ops/main.py rename to magma/squid_cnf/charms/squid/lib/ops/main.py diff --git a/magma/hackfest_squid_cnf/charms/squid/lib/ops/model.py b/magma/squid_cnf/charms/squid/lib/ops/model.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/lib/ops/model.py rename to magma/squid_cnf/charms/squid/lib/ops/model.py diff --git a/magma/hackfest_squid_cnf/charms/squid/lib/ops/testing.py b/magma/squid_cnf/charms/squid/lib/ops/testing.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/lib/ops/testing.py rename to magma/squid_cnf/charms/squid/lib/ops/testing.py diff --git a/magma/hackfest_squid_cnf/charms/squid/metadata.yaml b/magma/squid_cnf/charms/squid/metadata.yaml similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/metadata.yaml rename to magma/squid_cnf/charms/squid/metadata.yaml diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/.empty b/magma/squid_cnf/charms/squid/mod/.empty similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/.empty rename to magma/squid_cnf/charms/squid/mod/.empty diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/.flake8 b/magma/squid_cnf/charms/squid/mod/operator/.flake8 similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/.flake8 rename to magma/squid_cnf/charms/squid/mod/operator/.flake8 diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/.gitignore b/magma/squid_cnf/charms/squid/mod/operator/.gitignore similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/.gitignore rename to magma/squid_cnf/charms/squid/mod/operator/.gitignore diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/.readthedocs.yaml b/magma/squid_cnf/charms/squid/mod/operator/.readthedocs.yaml similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/.readthedocs.yaml rename to magma/squid_cnf/charms/squid/mod/operator/.readthedocs.yaml diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/.travis.yml b/magma/squid_cnf/charms/squid/mod/operator/.travis.yml similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/.travis.yml rename to magma/squid_cnf/charms/squid/mod/operator/.travis.yml diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/LICENSE.txt b/magma/squid_cnf/charms/squid/mod/operator/LICENSE.txt similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/LICENSE.txt rename to magma/squid_cnf/charms/squid/mod/operator/LICENSE.txt diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/README.md b/magma/squid_cnf/charms/squid/mod/operator/README.md similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/README.md rename to magma/squid_cnf/charms/squid/mod/operator/README.md diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/build_docs b/magma/squid_cnf/charms/squid/mod/operator/build_docs similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/build_docs rename to magma/squid_cnf/charms/squid/mod/operator/build_docs diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/docs/conf.py b/magma/squid_cnf/charms/squid/mod/operator/docs/conf.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/docs/conf.py rename to magma/squid_cnf/charms/squid/mod/operator/docs/conf.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/docs/index.rst b/magma/squid_cnf/charms/squid/mod/operator/docs/index.rst similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/docs/index.rst rename to magma/squid_cnf/charms/squid/mod/operator/docs/index.rst diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/docs/requirements.txt b/magma/squid_cnf/charms/squid/mod/operator/docs/requirements.txt similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/docs/requirements.txt rename to magma/squid_cnf/charms/squid/mod/operator/docs/requirements.txt diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/__init__.py b/magma/squid_cnf/charms/squid/mod/operator/ops/__init__.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/__init__.py rename to magma/squid_cnf/charms/squid/mod/operator/ops/__init__.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/charm.py b/magma/squid_cnf/charms/squid/mod/operator/ops/charm.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/charm.py rename to magma/squid_cnf/charms/squid/mod/operator/ops/charm.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/framework.py b/magma/squid_cnf/charms/squid/mod/operator/ops/framework.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/framework.py rename to magma/squid_cnf/charms/squid/mod/operator/ops/framework.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/jujuversion.py b/magma/squid_cnf/charms/squid/mod/operator/ops/jujuversion.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/jujuversion.py rename to magma/squid_cnf/charms/squid/mod/operator/ops/jujuversion.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/log.py b/magma/squid_cnf/charms/squid/mod/operator/ops/log.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/log.py rename to magma/squid_cnf/charms/squid/mod/operator/ops/log.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/main.py b/magma/squid_cnf/charms/squid/mod/operator/ops/main.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/main.py rename to magma/squid_cnf/charms/squid/mod/operator/ops/main.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/model.py b/magma/squid_cnf/charms/squid/mod/operator/ops/model.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/model.py rename to magma/squid_cnf/charms/squid/mod/operator/ops/model.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/testing.py b/magma/squid_cnf/charms/squid/mod/operator/ops/testing.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/ops/testing.py rename to magma/squid_cnf/charms/squid/mod/operator/ops/testing.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/requirements.txt b/magma/squid_cnf/charms/squid/mod/operator/requirements.txt similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/requirements.txt rename to magma/squid_cnf/charms/squid/mod/operator/requirements.txt diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/run_tests b/magma/squid_cnf/charms/squid/mod/operator/run_tests similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/run_tests rename to magma/squid_cnf/charms/squid/mod/operator/run_tests diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/setup.py b/magma/squid_cnf/charms/squid/mod/operator/setup.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/setup.py rename to magma/squid_cnf/charms/squid/mod/operator/setup.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/__init__.py b/magma/squid_cnf/charms/squid/mod/operator/test/__init__.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/__init__.py rename to magma/squid_cnf/charms/squid/mod/operator/test/__init__.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/bin/relation-ids b/magma/squid_cnf/charms/squid/mod/operator/test/bin/relation-ids similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/bin/relation-ids rename to magma/squid_cnf/charms/squid/mod/operator/test/bin/relation-ids diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/bin/relation-list b/magma/squid_cnf/charms/squid/mod/operator/test/bin/relation-list similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/bin/relation-list rename to magma/squid_cnf/charms/squid/mod/operator/test/bin/relation-list diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/charms/test_main/config.yaml b/magma/squid_cnf/charms/squid/mod/operator/test/charms/test_main/config.yaml similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/charms/test_main/config.yaml rename to magma/squid_cnf/charms/squid/mod/operator/test/charms/test_main/config.yaml diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/charms/test_main/lib/__init__.py b/magma/squid_cnf/charms/squid/mod/operator/test/charms/test_main/lib/__init__.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/charms/test_main/lib/__init__.py rename to magma/squid_cnf/charms/squid/mod/operator/test/charms/test_main/lib/__init__.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/charms/test_main/lib/ops b/magma/squid_cnf/charms/squid/mod/operator/test/charms/test_main/lib/ops similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/charms/test_main/lib/ops rename to magma/squid_cnf/charms/squid/mod/operator/test/charms/test_main/lib/ops diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/charms/test_main/metadata.yaml b/magma/squid_cnf/charms/squid/mod/operator/test/charms/test_main/metadata.yaml similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/charms/test_main/metadata.yaml rename to magma/squid_cnf/charms/squid/mod/operator/test/charms/test_main/metadata.yaml diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/charms/test_main/src/charm.py b/magma/squid_cnf/charms/squid/mod/operator/test/charms/test_main/src/charm.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/charms/test_main/src/charm.py rename to magma/squid_cnf/charms/squid/mod/operator/test/charms/test_main/src/charm.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_charm.py b/magma/squid_cnf/charms/squid/mod/operator/test/test_charm.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_charm.py rename to magma/squid_cnf/charms/squid/mod/operator/test/test_charm.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_framework.py b/magma/squid_cnf/charms/squid/mod/operator/test/test_framework.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_framework.py rename to magma/squid_cnf/charms/squid/mod/operator/test/test_framework.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_helpers.py b/magma/squid_cnf/charms/squid/mod/operator/test/test_helpers.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_helpers.py rename to magma/squid_cnf/charms/squid/mod/operator/test/test_helpers.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_infra.py b/magma/squid_cnf/charms/squid/mod/operator/test/test_infra.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_infra.py rename to magma/squid_cnf/charms/squid/mod/operator/test/test_infra.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_jujuversion.py b/magma/squid_cnf/charms/squid/mod/operator/test/test_jujuversion.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_jujuversion.py rename to magma/squid_cnf/charms/squid/mod/operator/test/test_jujuversion.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_log.py b/magma/squid_cnf/charms/squid/mod/operator/test/test_log.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_log.py rename to magma/squid_cnf/charms/squid/mod/operator/test/test_log.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_main.py b/magma/squid_cnf/charms/squid/mod/operator/test/test_main.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_main.py rename to magma/squid_cnf/charms/squid/mod/operator/test/test_main.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_model.py b/magma/squid_cnf/charms/squid/mod/operator/test/test_model.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_model.py rename to magma/squid_cnf/charms/squid/mod/operator/test/test_model.py diff --git a/magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_testing.py b/magma/squid_cnf/charms/squid/mod/operator/test/test_testing.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/mod/operator/test/test_testing.py rename to magma/squid_cnf/charms/squid/mod/operator/test/test_testing.py diff --git a/magma/hackfest_squid_cnf/charms/squid/src/charm.py b/magma/squid_cnf/charms/squid/src/charm.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/src/charm.py rename to magma/squid_cnf/charms/squid/src/charm.py diff --git a/magma/hackfest_squid_cnf/charms/squid/src/setuppath.py b/magma/squid_cnf/charms/squid/src/setuppath.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/src/setuppath.py rename to magma/squid_cnf/charms/squid/src/setuppath.py diff --git a/magma/hackfest_squid_cnf/charms/squid/tests/functional/requirements.txt b/magma/squid_cnf/charms/squid/tests/functional/requirements.txt similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/tests/functional/requirements.txt rename to magma/squid_cnf/charms/squid/tests/functional/requirements.txt diff --git a/magma/hackfest_squid_cnf/charms/squid/tests/functional/tests/bundles/bionic.yaml b/magma/squid_cnf/charms/squid/tests/functional/tests/bundles/bionic.yaml similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/tests/functional/tests/bundles/bionic.yaml rename to magma/squid_cnf/charms/squid/tests/functional/tests/bundles/bionic.yaml diff --git a/magma/hackfest_squid_cnf/charms/squid/tests/functional/tests/bundles/xenial.yaml b/magma/squid_cnf/charms/squid/tests/functional/tests/bundles/xenial.yaml similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/tests/functional/tests/bundles/xenial.yaml rename to magma/squid_cnf/charms/squid/tests/functional/tests/bundles/xenial.yaml diff --git a/magma/hackfest_squid_cnf/charms/squid/tests/functional/tests/tests.yaml b/magma/squid_cnf/charms/squid/tests/functional/tests/tests.yaml similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/tests/functional/tests/tests.yaml rename to magma/squid_cnf/charms/squid/tests/functional/tests/tests.yaml diff --git a/magma/hackfest_squid_cnf/charms/squid/tests/unit/operator_fixtures.py b/magma/squid_cnf/charms/squid/tests/unit/operator_fixtures.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/tests/unit/operator_fixtures.py rename to magma/squid_cnf/charms/squid/tests/unit/operator_fixtures.py diff --git a/magma/hackfest_squid_cnf/charms/squid/tests/unit/requirements.txt b/magma/squid_cnf/charms/squid/tests/unit/requirements.txt similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/tests/unit/requirements.txt rename to magma/squid_cnf/charms/squid/tests/unit/requirements.txt diff --git a/magma/hackfest_squid_cnf/charms/squid/tests/unit/setuppath.py b/magma/squid_cnf/charms/squid/tests/unit/setuppath.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/tests/unit/setuppath.py rename to magma/squid_cnf/charms/squid/tests/unit/setuppath.py diff --git a/magma/hackfest_squid_cnf/charms/squid/tests/unit/test_charm.py b/magma/squid_cnf/charms/squid/tests/unit/test_charm.py similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/tests/unit/test_charm.py rename to magma/squid_cnf/charms/squid/tests/unit/test_charm.py diff --git a/magma/hackfest_squid_cnf/charms/squid/tox.ini b/magma/squid_cnf/charms/squid/tox.ini similarity index 100% rename from magma/hackfest_squid_cnf/charms/squid/tox.ini rename to magma/squid_cnf/charms/squid/tox.ini diff --git a/magma/hackfest_squid_cnf/juju-bundles/bundle.yaml b/magma/squid_cnf/juju-bundles/bundle.yaml similarity index 100% rename from magma/hackfest_squid_cnf/juju-bundles/bundle.yaml rename to magma/squid_cnf/juju-bundles/bundle.yaml diff --git a/magma/hackfest_squid_cnf/squid_vnfd.yaml b/magma/squid_cnf/squid_vnfd.yaml similarity index 88% rename from magma/hackfest_squid_cnf/squid_vnfd.yaml rename to magma/squid_cnf/squid_vnfd.yaml index 379e5b6189516c8021c4026802b7d697db219ea2..2f84d8a81836c8ba50f80ceaad44a84f26388b13 100644 --- a/magma/hackfest_squid_cnf/squid_vnfd.yaml +++ b/magma/squid_cnf/squid_vnfd.yaml @@ -1,10 +1,10 @@ vnfd-catalog: schema-version: '3.0' vnfd: - - id: squid-vnf - name: squid-vnf - short-name: squid-vnf - description: Single container deployment of Squid Web Proxy + - id: squid_cnf + name: squid_cnf + short-name: squid_cnf + description: K8s container deployment of Squid Web Proxy vendor: Canonical version: "1.0" mgmt-interface: diff --git a/magma/hackfest_squid_cnf_ns/squid_cnf_nsd.yaml b/magma/squid_cnf_ns/squid_cnf_nsd.yaml similarity index 64% rename from magma/hackfest_squid_cnf_ns/squid_cnf_nsd.yaml rename to magma/squid_cnf_ns/squid_cnf_nsd.yaml index ab2ee6b6d12f76ff8bed04e5a3b599ec2d588de2..195ba25ac821c9c389b72b67deac1a932c9135b0 100644 --- a/magma/hackfest_squid_cnf_ns/squid_cnf_nsd.yaml +++ b/magma/squid_cnf_ns/squid_cnf_nsd.yaml @@ -1,15 +1,15 @@ nsd-catalog: nsd: - - id: squid-cnf-ns - name: squid-cnf-ns - short-name: squid-cnf-ns + - id: squid_cnf_ns + name: squid_cnf_ns + short-name: squid_cnf_ns description: NS with 1 KDU connected to the mgmtnet VL vendor: Canonical version: '1.0' logo: osm.png constituent-vnfd: - - vnfd-id-ref: squid-vnf - member-vnf-index: squid-vnf + - vnfd-id-ref: squid_cnf + member-vnf-index: squid_cnf vld: - id: mgmtnet name: mgmtnet @@ -18,6 +18,6 @@ nsd-catalog: mgmt-network: true vim-network-name: mgmt vnfd-connection-point-ref: - - member-vnf-index-ref: squid-vnf - vnfd-id-ref: squid-vnf + - member-vnf-index-ref: squid_cnf + vnfd-id-ref: squid_cnf vnfd-connection-point-ref: mgmtnet \ No newline at end of file