From 0d2b8a6534c31e1f45873221b90cd8d25464acd6 Mon Sep 17 00:00:00 2001 From: David Garcia Date: Tue, 14 Jul 2020 13:01:31 +0200 Subject: [PATCH] Fix NS Relations package and update submodules --- .../ha_proxy_charm_vnf/charms/simple/mod/charms.osm | 2 +- .../k8s_proxy_charm_vnf/charms/simple/metadata.yaml | 2 +- .../k8s_proxy_charm_vnf/charms/simple/mod/charms.osm | 2 +- charm-packages/ns_relations_ns/ns_relations_nsd.yaml | 4 ++-- .../charms/vyos-config/mod/charm-helpers | 2 +- magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charms.osm | 2 +- magma/hackfest_gateway_vnfd/charms/vyos-config/mod/operator | 2 +- magma/hackfest_magma-agw-enb_vnfd/charms/enodeb/mod/operator | 2 +- .../hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/charms.osm | 2 +- magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/operator | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charm-packages/ha_proxy_charm_vnf/charms/simple/mod/charms.osm b/charm-packages/ha_proxy_charm_vnf/charms/simple/mod/charms.osm index a9498d19..3d517f5e 160000 --- a/charm-packages/ha_proxy_charm_vnf/charms/simple/mod/charms.osm +++ b/charm-packages/ha_proxy_charm_vnf/charms/simple/mod/charms.osm @@ -1 +1 @@ -Subproject commit a9498d19ea1783461aa605253f6155a3d0ce43d8 +Subproject commit 3d517f5e42550d0b5c81aa4be20f7679020854d5 diff --git a/charm-packages/k8s_proxy_charm_vnf/charms/simple/metadata.yaml b/charm-packages/k8s_proxy_charm_vnf/charms/simple/metadata.yaml index 40b6c179..4b5b3528 100644 --- a/charm-packages/k8s_proxy_charm_vnf/charms/simple/metadata.yaml +++ b/charm-packages/k8s_proxy_charm_vnf/charms/simple/metadata.yaml @@ -15,7 +15,7 @@ # under the License. ## -name: simple-ha-proxy +name: simple-k8s-proxy summary: A simple example proxy charm description: | Simple proxy charm is an example charm used in OSM Hackfests diff --git a/charm-packages/k8s_proxy_charm_vnf/charms/simple/mod/charms.osm b/charm-packages/k8s_proxy_charm_vnf/charms/simple/mod/charms.osm index a9498d19..3d517f5e 160000 --- a/charm-packages/k8s_proxy_charm_vnf/charms/simple/mod/charms.osm +++ b/charm-packages/k8s_proxy_charm_vnf/charms/simple/mod/charms.osm @@ -1 +1 @@ -Subproject commit a9498d19ea1783461aa605253f6155a3d0ce43d8 +Subproject commit 3d517f5e42550d0b5c81aa4be20f7679020854d5 diff --git a/charm-packages/ns_relations_ns/ns_relations_nsd.yaml b/charm-packages/ns_relations_ns/ns_relations_nsd.yaml index da9ca734..c3f264c9 100755 --- a/charm-packages/ns_relations_ns/ns_relations_nsd.yaml +++ b/charm-packages/ns_relations_ns/ns_relations_nsd.yaml @@ -30,7 +30,7 @@ nsd:nsd-catalog: relation: - name: relation entities: - - id: simple_provides + - id: '1' endpoint: interface - - id: simple_requires + - id: '2' endpoint: interface \ No newline at end of file diff --git a/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charm-helpers b/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charm-helpers index 8a90d2cc..1989f1f2 160000 --- a/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charm-helpers +++ b/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charm-helpers @@ -1 +1 @@ -Subproject commit 8a90d2cc3aa0ba170756bdc87b4499903ac86fe5 +Subproject commit 1989f1f255baefb34cba7863606915dcd4ef1e38 diff --git a/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charms.osm b/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charms.osm index cf167cf0..3d517f5e 160000 --- a/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charms.osm +++ b/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charms.osm @@ -1 +1 @@ -Subproject commit cf167cf041a3d4ca9b8dd90e9f575c9c4e99b8ad +Subproject commit 3d517f5e42550d0b5c81aa4be20f7679020854d5 diff --git a/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/operator b/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/operator index a3918e1d..a84ce877 160000 --- a/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/operator +++ b/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/operator @@ -1 +1 @@ -Subproject commit a3918e1db40edac88a5250c46d7ef3156e8853d3 +Subproject commit a84ce8776b368a8b2bccdb173716e342db9a6b36 diff --git a/magma/hackfest_magma-agw-enb_vnfd/charms/enodeb/mod/operator b/magma/hackfest_magma-agw-enb_vnfd/charms/enodeb/mod/operator index a3918e1d..a84ce877 160000 --- a/magma/hackfest_magma-agw-enb_vnfd/charms/enodeb/mod/operator +++ b/magma/hackfest_magma-agw-enb_vnfd/charms/enodeb/mod/operator @@ -1 +1 @@ -Subproject commit a3918e1db40edac88a5250c46d7ef3156e8853d3 +Subproject commit a84ce8776b368a8b2bccdb173716e342db9a6b36 diff --git a/magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/charms.osm b/magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/charms.osm index 623ba0d8..3d517f5e 160000 --- a/magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/charms.osm +++ b/magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/charms.osm @@ -1 +1 @@ -Subproject commit 623ba0d8e6d3ff7a01067a0e09f15fc98ef6bec5 +Subproject commit 3d517f5e42550d0b5c81aa4be20f7679020854d5 diff --git a/magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/operator b/magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/operator index a3918e1d..a84ce877 160000 --- a/magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/operator +++ b/magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/operator @@ -1 +1 @@ -Subproject commit a3918e1db40edac88a5250c46d7ef3156e8853d3 +Subproject commit a84ce8776b368a8b2bccdb173716e342db9a6b36 -- GitLab