From 8bdff29ee67330ca02914730601b9e801818c190 Mon Sep 17 00:00:00 2001 From: beierlm Date: Sun, 29 Nov 2020 06:03:03 -0500 Subject: [PATCH 1/6] Correct package names Aligns the descriptor ids with the package name so the osm nfpkg-create can find the squid packages --- magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/README.md | 0 magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/actions.yaml | 0 .../{hackfest_squid_cnf => squid_cnf}/charms/squid/actions/addurl | 0 magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/config.yaml | 0 .../{hackfest_squid_cnf => squid_cnf}/charms/squid/hooks/install | 0 magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/.empty | 0 .../charms/squid/lib/ops/__init__.py | 0 .../charms/squid/lib/ops/charm.py | 0 .../charms/squid/lib/ops/framework.py | 0 .../charms/squid/lib/ops/jujuversion.py | 0 .../{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/log.py | 0 .../charms/squid/lib/ops/main.py | 0 .../charms/squid/lib/ops/model.py | 0 .../charms/squid/lib/ops/testing.py | 0 .../{hackfest_squid_cnf => squid_cnf}/charms/squid/metadata.yaml | 0 magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/.empty | 0 .../charms/squid/mod/operator/.flake8 | 0 .../charms/squid/mod/operator/.gitignore | 0 .../charms/squid/mod/operator/.readthedocs.yaml | 0 .../charms/squid/mod/operator/.travis.yml | 0 .../charms/squid/mod/operator/LICENSE.txt | 0 .../charms/squid/mod/operator/README.md | 0 .../charms/squid/mod/operator/build_docs | 0 .../charms/squid/mod/operator/docs/conf.py | 0 .../charms/squid/mod/operator/docs/index.rst | 0 .../charms/squid/mod/operator/docs/requirements.txt | 0 .../charms/squid/mod/operator/ops/__init__.py | 0 .../charms/squid/mod/operator/ops/charm.py | 0 .../charms/squid/mod/operator/ops/framework.py | 0 .../charms/squid/mod/operator/ops/jujuversion.py | 0 .../charms/squid/mod/operator/ops/log.py | 0 .../charms/squid/mod/operator/ops/main.py | 0 .../charms/squid/mod/operator/ops/model.py | 0 .../charms/squid/mod/operator/ops/testing.py | 0 .../charms/squid/mod/operator/requirements.txt | 0 .../charms/squid/mod/operator/run_tests | 0 .../charms/squid/mod/operator/setup.py | 0 .../charms/squid/mod/operator/test/__init__.py | 0 .../charms/squid/mod/operator/test/bin/relation-ids | 0 .../charms/squid/mod/operator/test/bin/relation-list | 0 .../charms/squid/mod/operator/test/charms/test_main/config.yaml | 0 .../squid/mod/operator/test/charms/test_main/lib/__init__.py | 0 .../charms/squid/mod/operator/test/charms/test_main/lib/ops | 0 .../charms/squid/mod/operator/test/charms/test_main/metadata.yaml | 0 .../charms/squid/mod/operator/test/charms/test_main/src/charm.py | 0 .../charms/squid/mod/operator/test/test_charm.py | 0 .../charms/squid/mod/operator/test/test_framework.py | 0 .../charms/squid/mod/operator/test/test_helpers.py | 0 .../charms/squid/mod/operator/test/test_infra.py | 0 .../charms/squid/mod/operator/test/test_jujuversion.py | 0 .../charms/squid/mod/operator/test/test_log.py | 0 .../charms/squid/mod/operator/test/test_main.py | 0 .../charms/squid/mod/operator/test/test_model.py | 0 .../charms/squid/mod/operator/test/test_testing.py | 0 magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/src/charm.py | 0 .../charms/squid/src/setuppath.py | 0 .../charms/squid/tests/functional/requirements.txt | 0 .../charms/squid/tests/functional/tests/bundles/bionic.yaml | 0 .../charms/squid/tests/functional/tests/bundles/xenial.yaml | 0 .../charms/squid/tests/functional/tests/tests.yaml | 0 .../charms/squid/tests/unit/operator_fixtures.py | 0 .../charms/squid/tests/unit/requirements.txt | 0 .../charms/squid/tests/unit/setuppath.py | 0 .../charms/squid/tests/unit/test_charm.py | 0 magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tox.ini | 0 magma/{hackfest_squid_cnf => squid_cnf}/juju-bundles/bundle.yaml | 0 magma/{hackfest_squid_cnf => squid_cnf}/squid_vnfd.yaml | 0 67 files changed, 0 insertions(+), 0 deletions(-) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/README.md (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/actions.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/actions/addurl (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/config.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/hooks/install (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/.empty (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/__init__.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/charm.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/framework.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/jujuversion.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/log.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/main.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/model.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/testing.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/metadata.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/.empty (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/.flake8 (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/.gitignore (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/.readthedocs.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/.travis.yml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/LICENSE.txt (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/README.md (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/build_docs (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/docs/conf.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/docs/index.rst (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/docs/requirements.txt (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/__init__.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/charm.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/framework.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/jujuversion.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/log.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/main.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/model.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/testing.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/requirements.txt (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/run_tests (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/setup.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/__init__.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/bin/relation-ids (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/bin/relation-list (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/charms/test_main/config.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/charms/test_main/lib/__init__.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/charms/test_main/lib/ops (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/charms/test_main/metadata.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/charms/test_main/src/charm.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_charm.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_framework.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_helpers.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_infra.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_jujuversion.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_log.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_main.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_model.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_testing.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/src/charm.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/src/setuppath.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/functional/requirements.txt (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/functional/tests/bundles/bionic.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/functional/tests/bundles/xenial.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/functional/tests/tests.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/unit/operator_fixtures.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/unit/requirements.txt (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/unit/setuppath.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/unit/test_charm.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tox.ini (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/juju-bundles/bundle.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/squid_vnfd.yaml (100%) 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 100% rename from magma/hackfest_squid_cnf/squid_vnfd.yaml rename to magma/squid_cnf/squid_vnfd.yaml -- GitLab From fd404b238862b316498fb057a8953ce36b2ef327 Mon Sep 17 00:00:00 2001 From: beierlm Date: Sun, 29 Nov 2020 06:03:03 -0500 Subject: [PATCH 2/6] Correct package names Aligns the descriptor ids with the package name so the osm nfpkg-create can find the squid packages --- magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/README.md | 0 magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/actions.yaml | 0 .../{hackfest_squid_cnf => squid_cnf}/charms/squid/actions/addurl | 0 magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/config.yaml | 0 .../{hackfest_squid_cnf => squid_cnf}/charms/squid/hooks/install | 0 magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/.empty | 0 .../charms/squid/lib/ops/__init__.py | 0 .../charms/squid/lib/ops/charm.py | 0 .../charms/squid/lib/ops/framework.py | 0 .../charms/squid/lib/ops/jujuversion.py | 0 .../{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/log.py | 0 .../charms/squid/lib/ops/main.py | 0 .../charms/squid/lib/ops/model.py | 0 .../charms/squid/lib/ops/testing.py | 0 .../{hackfest_squid_cnf => squid_cnf}/charms/squid/metadata.yaml | 0 magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/.empty | 0 .../charms/squid/mod/operator/.flake8 | 0 .../charms/squid/mod/operator/.gitignore | 0 .../charms/squid/mod/operator/.readthedocs.yaml | 0 .../charms/squid/mod/operator/.travis.yml | 0 .../charms/squid/mod/operator/LICENSE.txt | 0 .../charms/squid/mod/operator/README.md | 0 .../charms/squid/mod/operator/build_docs | 0 .../charms/squid/mod/operator/docs/conf.py | 0 .../charms/squid/mod/operator/docs/index.rst | 0 .../charms/squid/mod/operator/docs/requirements.txt | 0 .../charms/squid/mod/operator/ops/__init__.py | 0 .../charms/squid/mod/operator/ops/charm.py | 0 .../charms/squid/mod/operator/ops/framework.py | 0 .../charms/squid/mod/operator/ops/jujuversion.py | 0 .../charms/squid/mod/operator/ops/log.py | 0 .../charms/squid/mod/operator/ops/main.py | 0 .../charms/squid/mod/operator/ops/model.py | 0 .../charms/squid/mod/operator/ops/testing.py | 0 .../charms/squid/mod/operator/requirements.txt | 0 .../charms/squid/mod/operator/run_tests | 0 .../charms/squid/mod/operator/setup.py | 0 .../charms/squid/mod/operator/test/__init__.py | 0 .../charms/squid/mod/operator/test/bin/relation-ids | 0 .../charms/squid/mod/operator/test/bin/relation-list | 0 .../charms/squid/mod/operator/test/charms/test_main/config.yaml | 0 .../squid/mod/operator/test/charms/test_main/lib/__init__.py | 0 .../charms/squid/mod/operator/test/charms/test_main/lib/ops | 0 .../charms/squid/mod/operator/test/charms/test_main/metadata.yaml | 0 .../charms/squid/mod/operator/test/charms/test_main/src/charm.py | 0 .../charms/squid/mod/operator/test/test_charm.py | 0 .../charms/squid/mod/operator/test/test_framework.py | 0 .../charms/squid/mod/operator/test/test_helpers.py | 0 .../charms/squid/mod/operator/test/test_infra.py | 0 .../charms/squid/mod/operator/test/test_jujuversion.py | 0 .../charms/squid/mod/operator/test/test_log.py | 0 .../charms/squid/mod/operator/test/test_main.py | 0 .../charms/squid/mod/operator/test/test_model.py | 0 .../charms/squid/mod/operator/test/test_testing.py | 0 magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/src/charm.py | 0 .../charms/squid/src/setuppath.py | 0 .../charms/squid/tests/functional/requirements.txt | 0 .../charms/squid/tests/functional/tests/bundles/bionic.yaml | 0 .../charms/squid/tests/functional/tests/bundles/xenial.yaml | 0 .../charms/squid/tests/functional/tests/tests.yaml | 0 .../charms/squid/tests/unit/operator_fixtures.py | 0 .../charms/squid/tests/unit/requirements.txt | 0 .../charms/squid/tests/unit/setuppath.py | 0 .../charms/squid/tests/unit/test_charm.py | 0 magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tox.ini | 0 magma/{hackfest_squid_cnf => squid_cnf}/juju-bundles/bundle.yaml | 0 magma/{hackfest_squid_cnf => squid_cnf}/squid_vnfd.yaml | 0 67 files changed, 0 insertions(+), 0 deletions(-) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/README.md (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/actions.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/actions/addurl (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/config.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/hooks/install (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/.empty (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/__init__.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/charm.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/framework.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/jujuversion.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/log.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/main.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/model.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/lib/ops/testing.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/metadata.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/.empty (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/.flake8 (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/.gitignore (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/.readthedocs.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/.travis.yml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/LICENSE.txt (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/README.md (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/build_docs (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/docs/conf.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/docs/index.rst (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/docs/requirements.txt (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/__init__.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/charm.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/framework.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/jujuversion.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/log.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/main.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/model.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/ops/testing.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/requirements.txt (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/run_tests (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/setup.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/__init__.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/bin/relation-ids (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/bin/relation-list (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/charms/test_main/config.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/charms/test_main/lib/__init__.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/charms/test_main/lib/ops (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/charms/test_main/metadata.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/charms/test_main/src/charm.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_charm.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_framework.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_helpers.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_infra.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_jujuversion.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_log.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_main.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_model.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/mod/operator/test/test_testing.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/src/charm.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/src/setuppath.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/functional/requirements.txt (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/functional/tests/bundles/bionic.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/functional/tests/bundles/xenial.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/functional/tests/tests.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/unit/operator_fixtures.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/unit/requirements.txt (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/unit/setuppath.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tests/unit/test_charm.py (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/charms/squid/tox.ini (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/juju-bundles/bundle.yaml (100%) rename magma/{hackfest_squid_cnf => squid_cnf}/squid_vnfd.yaml (100%) 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 100% rename from magma/hackfest_squid_cnf/squid_vnfd.yaml rename to magma/squid_cnf/squid_vnfd.yaml -- GitLab From e54965d76754ec241515ee02a8cbc09ab71d7ece Mon Sep 17 00:00:00 2001 From: beierlm Date: Sun, 29 Nov 2020 06:30:53 -0500 Subject: [PATCH 3/6] Update id Signed-off-by: beierlm --- magma/squid_cnf/squid_vnfd.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/magma/squid_cnf/squid_vnfd.yaml b/magma/squid_cnf/squid_vnfd.yaml index 379e5b61..fd9b8680 100644 --- a/magma/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: -- GitLab From e16d20f9a38820773087e42432f82506cbff2a39 Mon Sep 17 00:00:00 2001 From: beierlm Date: Sun, 29 Nov 2020 06:48:33 -0500 Subject: [PATCH 4/6] Rename vnfd again Signed-off-by: beierlm --- magma/squid_cnf/squid_vnfd.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/magma/squid_cnf/squid_vnfd.yaml b/magma/squid_cnf/squid_vnfd.yaml index fd9b8680..2f84d8a8 100644 --- a/magma/squid_cnf/squid_vnfd.yaml +++ b/magma/squid_cnf/squid_vnfd.yaml @@ -1,9 +1,9 @@ vnfd-catalog: schema-version: '3.0' vnfd: - - id: squid-cnf - name: squid-cnf - short-name: squid-cnf + - id: squid_cnf + name: squid_cnf + short-name: squid_cnf description: K8s container deployment of Squid Web Proxy vendor: Canonical version: "1.0" -- GitLab From aad39502ec7190d62343c442407345626df11507 Mon Sep 17 00:00:00 2001 From: beierlm Date: Sun, 29 Nov 2020 06:54:06 -0500 Subject: [PATCH 5/6] Rename nsd Signed-off-by: beierlm --- .../squid_cnf_nsd.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename magma/{hackfest_squid_cnf_ns => squid_cnf_ns}/squid_cnf_nsd.yaml (87%) diff --git a/magma/hackfest_squid_cnf_ns/squid_cnf_nsd.yaml b/magma/squid_cnf_ns/squid_cnf_nsd.yaml similarity index 87% rename from magma/hackfest_squid_cnf_ns/squid_cnf_nsd.yaml rename to magma/squid_cnf_ns/squid_cnf_nsd.yaml index ab2ee6b6..1a24ebfd 100644 --- a/magma/hackfest_squid_cnf_ns/squid_cnf_nsd.yaml +++ b/magma/squid_cnf_ns/squid_cnf_nsd.yaml @@ -1,8 +1,8 @@ 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' -- GitLab From becda4b2f1e2bf1244636c03ebf30d827b37bd22 Mon Sep 17 00:00:00 2001 From: beierlm Date: Sun, 29 Nov 2020 06:59:55 -0500 Subject: [PATCH 6/6] Update reference in NSD Signed-off-by: beierlm --- magma/squid_cnf_ns/squid_cnf_nsd.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/magma/squid_cnf_ns/squid_cnf_nsd.yaml b/magma/squid_cnf_ns/squid_cnf_nsd.yaml index 1a24ebfd..195ba25a 100644 --- a/magma/squid_cnf_ns/squid_cnf_nsd.yaml +++ b/magma/squid_cnf_ns/squid_cnf_nsd.yaml @@ -8,8 +8,8 @@ nsd-catalog: 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 -- GitLab