From 38d606dd299f0bbb384bb2a90525b4a67688753e Mon Sep 17 00:00:00 2001 From: bravof Date: Wed, 17 Feb 2021 11:52:10 -0300 Subject: [PATCH 1/4] feat(configuration): OSM-Packages with new way to store configurations Signed-off-by: bravof --- .../ha_proxy_charm_vnfd.yaml | 66 ++-- .../k8s_proxy_charm_vnfd.yaml | 67 +++-- .../native_charm_vnf/native_charm_vnfd.yaml | 47 +-- .../native_k8s_charm_vnfd.yaml | 43 +-- .../nopasswd_k8s_proxy_charm_vnfd.yaml | 61 ++-- .../nopasswd_proxy_charm_vnfd.yaml | 59 ++-- .../ns_relations_provides_vnfd.yaml | 47 +-- .../ns_relations_requires_vnfd.yaml | 47 +-- .../proxy_native_relation_vnfd.yaml | 119 ++++---- .../vnf_relations_vnf/vnf_relations_vnfd.yaml | 108 ++++--- .../hackfest_k8sproxycharm_vnfd.yaml | 59 ++-- .../hackfest_proxycharm_vnfd.yaml | 63 ++-- .../k8s_jujucontroller_vnfd.yaml | 283 +++++++++--------- .../hackfest_gateway_vnfd.yaml | 51 ++-- .../magma-agw-enb_vnfd.yaml | 214 +++++++------ magma/squid_cnf/squid_vnfd.yaml | 41 +-- nscharm_policy_vnf/nscharm_policy_vnfd.yaml | 33 +- nscharm_user_vnf/nscharm_user_vnfd.yaml | 33 +- simple_ee_vnf/simple_ee_vnfd.yaml | 79 ++--- simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml | 57 ++-- snmp_ee_vnf/snmp_ee_vnfd.yaml | 51 ++-- snmp_setcomm_ee_vnf/snmp_setcomm_ee_vnfd.yaml | 81 ++--- vdu_replicas_vnf/vdu_replicas_vnfd.yaml | 15 +- 23 files changed, 871 insertions(+), 853 deletions(-) diff --git a/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml b/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml index cede95f0..0a23b2f9 100644 --- a/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml +++ b/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml @@ -15,7 +15,38 @@ vnfd: vdu-profile: - id: mgmtVM min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - id: ha_proxy_charm-vnf + config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + initial-config-primitive: + - name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: osm4u + seq: 1 + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 2 + juju: + charm: simple ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -50,7 +81,6 @@ vnfd: virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage - virtual-compute-desc: - id: mgmtVM-compute virtual-cpu: @@ -59,34 +89,4 @@ vnfd: size: "1.0" virtual-storage-desc: - id: mgmtVM-storage - size-of-storage: "10" - vnf-configuration: - - id: default-vnf-configuration - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - - name: ssh-password - value: osm4u - seq: 1 - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: 2 - juju: - charm: simple + size-of-storage: "10" diff --git a/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml b/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml index 5a844ef6..c6e77234 100644 --- a/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml +++ b/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml @@ -11,7 +11,39 @@ vnfd: vdu-profile: - id: mgmtVM min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + config-access: + ssh-access: + default-user: ubuntu + required: true + id: k8s_proxy_charm-vnf + initial-config-primitive: + - name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: osm4u + seq: 1 + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 2 + juju: + charm: simple + cloud: k8s ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -58,35 +90,4 @@ vnfd: size: 1.0 virtual-storage-desc: - id: mgmtVM-storage - size-of-storage: 10 - vnf-configuration: - - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - config-access: - ssh-access: - default-user: ubuntu - required: true - id: default-vnf-configuration - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - - name: ssh-password - value: osm4u - seq: 1 - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: 2 - juju: - charm: simple - cloud: k8s + size-of-storage: 10 diff --git a/charm-packages/native_charm_vnf/native_charm_vnfd.yaml b/charm-packages/native_charm_vnf/native_charm_vnfd.yaml index 1c6cb9c4..553176df 100644 --- a/charm-packages/native_charm_vnf/native_charm_vnfd.yaml +++ b/charm-packages/native_charm_vnf/native_charm_vnfd.yaml @@ -11,7 +11,30 @@ vnfd: vdu-profile: - id: mgmtVM min-number-of-instances: 1 - vdu-configuration-id: mgmtVM-vdu-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + id: mgmtVM + initial-config-primitive: + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 1 + juju: + charm: simple + proxy: false ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -49,28 +72,6 @@ vnfd: virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage - vdu-configuration: - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - id: mgmtVM-vdu-configuration - initial-config-primitive: - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: 1 - juju: - charm: simple - proxy: false version: 1.0 virtual-compute-desc: - id: mgmtVM-compute diff --git a/charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml b/charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml index 6f4da557..35d47cae 100644 --- a/charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml +++ b/charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml @@ -1,6 +1,29 @@ vnfd: df: - id: default-df + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - id: native-kdu + config-primitive: + - name: changecontent + parameter: + - data-type: STRING + default-value: nginx + name: application-name + - data-type: STRING + default-value: '' + name: customtitle + initial-config-primitive: + - name: changecontent + parameter: + - data-type: STRING + name: application-name + value: nginx + - data-type: STRING + name: customtitle + value: Initial Config Primitive + seq: 1 ext-cpd: - id: mgmt-ext k8s-cluster-net: mgmtnet @@ -11,25 +34,5 @@ vnfd: kdu: - name: native-kdu juju-bundle: bundle.yaml - kdu-configuration: - config-primitive: - - name: changecontent - parameter: - - data-type: STRING - default-value: nginx - name: application-name - - data-type: STRING - default-value: '' - name: customtitle - initial-config-primitive: - - name: changecontent - parameter: - - data-type: STRING - name: application-name - value: nginx - - data-type: STRING - name: customtitle - value: Initial Config Primitive - seq: 1 mgmt-cp: mgmt-ext product-name: native_k8s_charm-vnf diff --git a/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml b/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml index 28a770fe..38f7585c 100644 --- a/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml +++ b/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml @@ -11,7 +11,37 @@ vnfd: vdu-profile: - id: mgmtVM min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + id: nopasswd_k8s_proxy_charm-vnf + initial-config-primitive: + - name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + seq: 1 + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 2 + juju: + charm: simple + cloud: k8s ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -59,32 +89,3 @@ vnfd: virtual-storage-desc: - id: mgmtVM-storage size-of-storage: 10 - vnf-configuration: - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - id: default-vnf-configuration - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - seq: 1 - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: 2 - juju: - charm: simple - cloud: k8s diff --git a/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml b/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml index c86a8767..02dd5fbf 100644 --- a/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml +++ b/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml @@ -11,7 +11,36 @@ vnfd: vdu-profile: - id: mgmtVM min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + id: nopasswd_proxy_charm-vnf + initial-config-primitive: + - name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + seq: 1 + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 2 + juju: + charm: simple ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -59,31 +88,3 @@ vnfd: virtual-storage-desc: - id: mgmtVM-storage size-of-storage: 10 - vnf-configuration: - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - id: default-vnf-configuration - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - seq: 1 - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: 2 - juju: - charm: simple diff --git a/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml b/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml index 06e2fde7..7173b52d 100644 --- a/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml +++ b/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml @@ -11,7 +11,30 @@ vnfd: vdu-profile: - id: simple_provides min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + id: ns_relations_provides-vnf + initial-config-primitive: + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 1 + juju: + charm: simple_provides + proxy: false ext-cpd: - id: provides-mgmt-ext int-cpd: @@ -49,25 +72,3 @@ vnfd: virtual-storage-desc: - id: simple_provides-storage size-of-storage: 10 - vnf-configuration: - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - id: default-vnf-configuration - initial-config-primitive: - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: 1 - juju: - charm: simple_provides - proxy: false diff --git a/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml b/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml index cf61060a..d33bd8b5 100644 --- a/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml +++ b/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml @@ -11,7 +11,30 @@ vnfd: vdu-profile: - id: simple_requires min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + id: ns_relations_requires-vnf + initial-config-primitive: + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 1 + juju: + charm: simple_requires + proxy: false ext-cpd: - id: requires-mgmt-ext int-cpd: @@ -49,25 +72,3 @@ vnfd: virtual-storage-desc: - id: simple_requires-storage size-of-storage: 10 - vnf-configuration: - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - id: default-vnf-configuration - initial-config-primitive: - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: 1 - juju: - charm: simple_requires - proxy: false diff --git a/charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml b/charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml index d0789e5f..550c7e97 100644 --- a/charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml +++ b/charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml @@ -13,10 +13,67 @@ vnfd: vdu-profile: - id: simple_requires min-number-of-instances: 1 - vdu-configuration-id: simple_requires-vdu-configuration - id: simple_provides min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + id: proxy_native_relation-vnf + initial-config-primitive: + - name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + seq: 1 + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 2 + juju: + charm: simple_provides_proxy + proxy: true + relation: + - entities: + - endpoint: interface + id: proxy_native_relation-vnf + - endpoint: interface + id: simple_requires + name: relation + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + id: simple_requires + initial-config-primitive: + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 1 + juju: + charm: simple_requires + proxy: false ext-cpd: - id: requires-mgmt-ext int-cpd: @@ -62,28 +119,6 @@ vnfd: virtual-compute-desc: simple_provides-compute virtual-storage-desc: - simple_provides-storage - vdu-configuration: - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - id: simple_requires-vdu-configuration - initial-config-primitive: - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: 1 - juju: - charm: simple_requires - proxy: false version: 1.0 virtual-compute-desc: - id: simple_requires-compute @@ -101,39 +136,3 @@ vnfd: size-of-storage: 10 - id: simple_provides-storage size-of-storage: 10 - vnf-configuration: - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - id: default-vnf-configuration - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - seq: 1 - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: 2 - juju: - charm: simple_provides_proxy - proxy: true - relation: - - entities: - - endpoint: interface - id: proxy_native_relation-vnf - - endpoint: interface - id: simple_requires - name: relation diff --git a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml index c38755fb..28ce0448 100644 --- a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml +++ b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml @@ -13,11 +13,61 @@ vnfd: vdu-profile: - id: simple_requires min-number-of-instances: 1 - vdu-configuration-id: simple_requires-vdu-configuration - id: simple_provides min-number-of-instances: 1 - vdu-configuration-id: simple_provides-vdu-configuration - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - id: vnf_relations-vnf + relation: + - entities: + - endpoint: interface + id: simple_provides + - endpoint: interface + id: simple_requires + name: relation + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + id: simple_requires + initial-config-primitive: + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 1 + juju: + charm: simple_requires + proxy: false + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + id: simple_provides + initial-config-primitive: + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 1 + juju: + charm: simple_provides + proxy: false ext-cpd: - id: requires-mgmt-ext int-cpd: @@ -63,49 +113,6 @@ vnfd: virtual-compute-desc: simple_provides-compute virtual-storage-desc: - simple_provides-storage - vdu-configuration: - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - id: simple_requires-vdu-configuration - initial-config-primitive: - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: 1 - juju: - charm: simple_requires - proxy: false - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - id: simple_provides-vdu-configuration - initial-config-primitive: - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: 1 - juju: - charm: simple_provides - proxy: false version: 1.0 virtual-compute-desc: - id: simple_requires-compute @@ -123,12 +130,3 @@ vnfd: size-of-storage: 10 - id: simple_provides-storage size-of-storage: 10 - vnf-configuration: - - id: default-vnf-configuration - relation: - - entities: - - endpoint: interface - id: simple_provides - - endpoint: interface - id: simple_requires - name: relation diff --git a/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml b/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml index 903d8844..f29c80fd 100644 --- a/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml +++ b/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml @@ -11,7 +11,36 @@ vnfd: vdu-profile: - id: mgmtVM min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + id: hackfest_k8sproxycharm-vnf + initial-config-primitive: + - name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: osm4u + seq: '1' + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: '2' + juju: + charm: charm-simple-k8s + cloud: k8s + proxy: true ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -59,31 +88,3 @@ vnfd: virtual-storage-desc: - id: mgmtVM-storage size-of-storage: 10 - vnf-configuration: - - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - id: default-vnf-configuration - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - - name: ssh-password - value: osm4u - seq: '1' - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: '2' - juju: - charm: charm-simple-k8s - cloud: k8s - proxy: true diff --git a/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml b/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml index b017e077..4421ba1a 100644 --- a/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml +++ b/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml @@ -11,7 +11,38 @@ vnfd: vdu-profile: - id: mgmtVM min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + id: hackfest_proxycharm-vnf + config-access: + ssh-access: + default-user: ubuntu + required: true + initial-config-primitive: + - name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: osm4u + seq: 1 + - name: touch + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 2 + juju: + charm: simple ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -59,33 +90,3 @@ vnfd: virtual-storage-desc: - id: mgmtVM-storage size-of-storage: 10 - vnf-configuration: - - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - id: default-vnf-configuration - config-access: - ssh-access: - default-user: ubuntu - required: true - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - - name: ssh-password - value: osm4u - seq: 1 - - name: touch - parameter: - - data-type: STRING - name: filename - value: /home/ubuntu/first-touch - seq: 2 - juju: - charm: simple diff --git a/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml b/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml index f60b652a..9ffd11f6 100644 --- a/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml +++ b/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml @@ -10,7 +10,148 @@ vnfd: vdu-profile: - id: k8svm min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: setup-juju + - name: deploy-bundle + parameter: + - data-type: STRING + name: bundle + - name: undeploy-bundle + - name: remove-machines + - name: init-helm + - name: install-openebs-chart + - name: install-openebs-kubectl + - name: post-deploy + - name: add-machine + parameter: + - data-type: STRING + name: machine + - name: add-machines + parameter: + - data-type: STRING + name: machine1 + - data-type: STRING + name: machine2 + - data-type: STRING + name: machine3 + - data-type: STRING + name: machine4 + - data-type: STRING + name: machine5 + - data-type: STRING + name: machine6 + - data-type: STRING + name: machine7 + - data-type: STRING + name: machine8 + - data-type: STRING + name: machine9 + - data-type: STRING + name: machine10 + - name: remove-machines + parameter: + - data-type: STRING + name: force + - name: add-repo + parameter: + - data-type: STRING + name: name + - data-type: STRING + name: url + - name: remove-repo + parameter: + - data-type: STRING + name: name + - name: install-chart + parameter: + - data-type: STRING + name: chart + - data-type: STRING + name: name + - data-type: STRING + name: namespace + - data-type: STRING + name: atomic + - data-type: STRING + name: values + - data-type: STRING + name: valuesFile + - name: upgrade-release + parameter: + - data-type: STRING + name: chart + - data-type: STRING + name: name + - data-type: STRING + name: namespace + - data-type: STRING + name: atomic + - data-type: STRING + name: values + - data-type: STRING + name: valuesFile + - name: rollback-release + parameter: + - data-type: STRING + name: name + - data-type: STRING + name: revision + - name: delete-release + parameter: + - data-type: STRING + name: name + id: k8s_jujucontroller_vnf + initial-config-primitive: + - name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + seq: '1' + - name: setup-juju + seq: '2' + - name: add-machines + parameter: + - name: machine1 + value: + - name: machine2 + value: + - name: machine3 + value: + - name: machine4 + value: + - name: machine5 + value: + - name: machine6 + value: + - name: machine7 + value: + - name: machine8 + value: + - name: machine9 + value: + - name: machine10 + value: + seq: '3' + - name: deploy-bundle + parameter: + - name: bundle + value: + seq: '4' + - name: post-deploy + seq: '5' + - name: install-openebs-kubectl + seq: '6' + juju: + charm: tid-jujuk8s ext-cpd: - id: mgmt-ext int-cpd: @@ -48,143 +189,3 @@ vnfd: virtual-storage-desc: - id: k8svm-storage size-of-storage: 80 - vnf-configuration: - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: setup-juju - - name: deploy-bundle - parameter: - - data-type: STRING - name: bundle - - name: undeploy-bundle - - name: remove-machines - - name: init-helm - - name: install-openebs-chart - - name: install-openebs-kubectl - - name: post-deploy - - name: add-machine - parameter: - - data-type: STRING - name: machine - - name: add-machines - parameter: - - data-type: STRING - name: machine1 - - data-type: STRING - name: machine2 - - data-type: STRING - name: machine3 - - data-type: STRING - name: machine4 - - data-type: STRING - name: machine5 - - data-type: STRING - name: machine6 - - data-type: STRING - name: machine7 - - data-type: STRING - name: machine8 - - data-type: STRING - name: machine9 - - data-type: STRING - name: machine10 - - name: remove-machines - parameter: - - data-type: STRING - name: force - - name: add-repo - parameter: - - data-type: STRING - name: name - - data-type: STRING - name: url - - name: remove-repo - parameter: - - data-type: STRING - name: name - - name: install-chart - parameter: - - data-type: STRING - name: chart - - data-type: STRING - name: name - - data-type: STRING - name: namespace - - data-type: STRING - name: atomic - - data-type: STRING - name: values - - data-type: STRING - name: valuesFile - - name: upgrade-release - parameter: - - data-type: STRING - name: chart - - data-type: STRING - name: name - - data-type: STRING - name: namespace - - data-type: STRING - name: atomic - - data-type: STRING - name: values - - data-type: STRING - name: valuesFile - - name: rollback-release - parameter: - - data-type: STRING - name: name - - data-type: STRING - name: revision - - name: delete-release - parameter: - - data-type: STRING - name: name - id: default-vnf-configuration - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - seq: '1' - - name: setup-juju - seq: '2' - - name: add-machines - parameter: - - name: machine1 - value: - - name: machine2 - value: - - name: machine3 - value: - - name: machine4 - value: - - name: machine5 - value: - - name: machine6 - value: - - name: machine7 - value: - - name: machine8 - value: - - name: machine9 - value: - - name: machine10 - value: - seq: '3' - - name: deploy-bundle - parameter: - - name: bundle - value: - seq: '4' - - name: post-deploy - seq: '5' - - name: install-openebs-kubectl - seq: '6' - juju: - charm: tid-jujuk8s diff --git a/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml b/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml index 40a8255b..6fe1bcf0 100644 --- a/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml +++ b/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml @@ -10,7 +10,32 @@ vnfd: vdu-profile: - id: gateway_pdu min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-primitive: + - name: configure-remote + parameter: + - data-type: STRING + default-value: 0.0.0.0 + name: magmaIP + id: hackfest_gateway_vnfd + config-access: + ssh-access: + default-user: osm + required: true + initial-config-primitive: + - name: config + parameter: + - name: ssh-username + value: osm + - name: ssh-password + value: osm2020 + - name: ssh-hostname + value: + seq: 1 + juju: + charm: vyos-config ext-cpd: - id: gateway_public-ext int-cpd: @@ -28,27 +53,3 @@ vnfd: - name: eth0 pdu-type: gateway version: '1.0' - vnf-configuration: - - config-primitive: - - name: configure-remote - parameter: - - data-type: STRING - default-value: 0.0.0.0 - name: magmaIP - id: default-vnf-configuration - config-access: - ssh-access: - default-user: osm - required: true - initial-config-primitive: - - name: config - parameter: - - name: ssh-username - value: osm - - name: ssh-password - value: osm2020 - - name: ssh-hostname - value: - seq: 1 - juju: - charm: vyos-config diff --git a/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml b/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml index d5efb43b..26cc6a87 100644 --- a/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml +++ b/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml @@ -35,10 +35,8 @@ vnfd: - id: magma-agw-vdu max-number-of-instances: 1 min-number-of-instances: 1 - vdu-configuration-id: magma-agw-vdu-vdu-configuration - id: srsLTE-vdu min-number-of-instances: 1 - vdu-configuration-id: srsLTE-vdu-vdu-configuration virtual-link-profile: - flavour: '' id: internalS1 @@ -49,7 +47,112 @@ vnfd: dhcp-enabled: true ip-version: ipv4 name: internalS1-l3-protocol-data - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - id: hackfest_magma-agw-enb_vnfd + relation: + - entities: + - endpoint: mme + id: srsLTE-vdu + - endpoint: agw + id: magma-agw-vdu + name: agw + - config-access: + ssh-access: + required: true + config-primitive: + - name: add-gw + parameter: + - default-value: + name: agw_id + - default-value: + name: agw_name + - default-value: + name: orch_ip + - default-value: + name: orch_net + - name: del-gw + parameter: + - default-value: + name: agw_id + - default-value: + name: orch_ip + - default-value: + name: orch_net + - name: reset-id + - name: restart-magma + id: magma-agw-vdu + initial-config-primitive: + - name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: magma + - name: ssh-password + value: magma + seq: 1 + - name: reset-id + seq: 2 + - name: add-net + parameter: + - name: orch_ip + value: + - name: orch_net + value: + seq: 3 + - name: add-gw + parameter: + - name: agw_id + value: + - name: agw_name + value: + - name: orch_ip + value: + - name: orch_net + value: + seq: 4 + - name: add-test-subscriber + parameter: + - name: orch_ip + value: + - name: orch_net + value: + seq: 5 + - name: add-hosts + parameter: + - name: orch_ip + value: + seq: 6 + - name: restart-magma + seq: 7 + juju: + charm: magmagw + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: attach-ue + parameter: + - data-type: STRING + name: usim-imsi + - data-type: STRING + name: usim-k + - data-type: STRING + name: usim-opc + - name: detach-ue + id: srsLTE-vdu + initial-config-primitive: + - name: config + parameter: + - name: bind-address-subnet + value: 192.168.100.0/24 + seq: 1 + juju: + charm: srs-enb-ue + proxy: false ext-cpd: - id: agw-sgi-ext int-cpd: @@ -146,102 +249,6 @@ vnfd: virtual-compute-desc: srsLTE-vdu-compute virtual-storage-desc: - srsLTE-vdu-storage - vdu-configuration: - - config-access: - ssh-access: - required: true - config-primitive: - - name: add-gw - parameter: - - default-value: - name: agw_id - - default-value: - name: agw_name - - default-value: - name: orch_ip - - default-value: - name: orch_net - - name: del-gw - parameter: - - default-value: - name: agw_id - - default-value: - name: orch_ip - - default-value: - name: orch_net - - name: reset-id - - name: restart-magma - id: magma-agw-vdu-vdu-configuration - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: magma - - name: ssh-password - value: magma - seq: 1 - - name: reset-id - seq: 2 - - name: add-net - parameter: - - name: orch_ip - value: - - name: orch_net - value: - seq: 3 - - name: add-gw - parameter: - - name: agw_id - value: - - name: agw_name - value: - - name: orch_ip - value: - - name: orch_net - value: - seq: 4 - - name: add-test-subscriber - parameter: - - name: orch_ip - value: - - name: orch_net - value: - seq: 5 - - name: add-hosts - parameter: - - name: orch_ip - value: - seq: 6 - - name: restart-magma - seq: 7 - juju: - charm: magmagw - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: attach-ue - parameter: - - data-type: STRING - name: usim-imsi - - data-type: STRING - name: usim-k - - data-type: STRING - name: usim-opc - - name: detach-ue - id: srsLTE-vdu-vdu-configuration - initial-config-primitive: - - name: config - parameter: - - name: bind-address-subnet - value: 192.168.100.0/24 - seq: 1 - juju: - charm: srs-enb-ue - proxy: false version: '1.0' virtual-compute-desc: - id: magma-agw-vdu-compute @@ -259,12 +266,3 @@ vnfd: size-of-storage: 50 - id: srsLTE-vdu-storage size-of-storage: 8 - vnf-configuration: - - id: default-vnf-configuration - relation: - - entities: - - endpoint: mme - id: srsLTE-vdu - - endpoint: agw - id: magma-agw-vdu - name: agw diff --git a/magma/squid_cnf/squid_vnfd.yaml b/magma/squid_cnf/squid_vnfd.yaml index 629333ae..7b9348ac 100644 --- a/magma/squid_cnf/squid_vnfd.yaml +++ b/magma/squid_cnf/squid_vnfd.yaml @@ -2,6 +2,27 @@ vnfd: description: K8s container deployment of Squid Web Proxy df: - id: default-df + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - id: + config-primitive: + - name: addurl + parameter: + - data-type: STRING + default-value: squid + name: application-name + - data-type: STRING + default-value: '' + name: url + - name: deleteurl + parameter: + - data-type: STRING + default-value: squid + name: application-name + - data-type: STRING + default-value: '' + name: url ext-cpd: - id: mgmtnet-ext k8s-cluster-net: mgmtnet @@ -11,25 +32,7 @@ vnfd: - id: mgmtnet kdu: - name: squid-kdu - juju-bundle: bundle.yaml - kdu-configuration: - config-primitive: - - name: addurl - parameter: - - data-type: STRING - default-value: squid - name: application-name - - data-type: STRING - default-value: '' - name: url - - name: deleteurl - parameter: - - data-type: STRING - default-value: squid - name: application-name - - data-type: STRING - default-value: '' - name: url + juju-bundle: bundle.yaml mgmt-cp: mgmtnet-ext product-name: squid_cnf provider: Canonical diff --git a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml index ff3166a2..4cc930cb 100644 --- a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml +++ b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml @@ -10,7 +10,23 @@ vnfd: vdu-profile: - id: policyVM min-number-of-instances: 1 - vdu-configuration-id: policyVM-vdu-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - id: policyVM + initial-config-primitive: + - name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: osm4u + seq: '1' + juju: + charm: vnf-policy + proxy: true ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -47,21 +63,6 @@ vnfd: virtual-compute-desc: policyVM-compute virtual-storage-desc: - policyVM-storage - vdu-configuration: - - id: policyVM-vdu-configuration - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - - name: ssh-password - value: osm4u - seq: '1' - juju: - charm: vnf-policy - proxy: true version: '1.0' virtual-compute-desc: - id: policyVM-compute diff --git a/nscharm_user_vnf/nscharm_user_vnfd.yaml b/nscharm_user_vnf/nscharm_user_vnfd.yaml index 73059b35..87ff8dda 100644 --- a/nscharm_user_vnf/nscharm_user_vnfd.yaml +++ b/nscharm_user_vnf/nscharm_user_vnfd.yaml @@ -10,7 +10,23 @@ vnfd: vdu-profile: - id: userVM min-number-of-instances: 1 - vdu-configuration-id: userVM-vdu-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - id: userVM + initial-config-primitive: + - name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: osm4u + seq: '1' + juju: + charm: vnf-user + proxy: true ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -47,21 +63,6 @@ vnfd: virtual-compute-desc: userVM-compute virtual-storage-desc: - userVM-storage - vdu-configuration: - - id: userVM-vdu-configuration - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - - name: ssh-password - value: osm4u - seq: '1' - juju: - charm: vnf-user - proxy: true version: '1.0' virtual-compute-desc: - id: userVM-compute diff --git a/simple_ee_vnf/simple_ee_vnfd.yaml b/simple_ee_vnf/simple_ee_vnfd.yaml index 6be9c35f..d90fb6b2 100644 --- a/simple_ee_vnf/simple_ee_vnfd.yaml +++ b/simple_ee_vnf/simple_ee_vnfd.yaml @@ -10,7 +10,46 @@ vnfd: vdu-profile: - id: mgmtVM min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - execution-environment-primitive: touch + execution-environment-ref: monitor + name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: file-path + - execution-environment-primitive: sleep + execution-environment-ref: monitor + name: sleep + execution-environment-list: + - connection-point-ref: vnf-mgmt + helm-chart: eechart + id: monitor + id: simple_ee-vnf + initial-config-primitive: + - execution-environment-ref: monitor + name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: osm2020 + seq: '1' + - execution-environment-ref: monitor + name: touch + parameter: + - name: file-path + value: /home/ubuntu/first-touch + seq: '2' ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -58,41 +97,3 @@ vnfd: virtual-storage-desc: - id: mgmtVM-storage size-of-storage: 20 - vnf-configuration: - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - execution-environment-primitive: touch - execution-environment-ref: monitor - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: file-path - - execution-environment-primitive: sleep - execution-environment-ref: monitor - name: sleep - execution-environment-list: - - connection-point-ref: vnf-mgmt - helm-chart: eechart - id: monitor - id: default-vnf-configuration - initial-config-primitive: - - execution-environment-ref: monitor - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - - name: ssh-password - value: osm2020 - seq: '1' - - execution-environment-ref: monitor - name: touch - parameter: - - name: file-path - value: /home/ubuntu/first-touch - seq: '2' diff --git a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml index 716bce93..f94854a9 100644 --- a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml +++ b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml @@ -15,7 +15,35 @@ vnfd: min-number-of-instances: 1 - id: dataVM min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-access: + ssh-access: + default-user: ubuntu + required: true + config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + id: simple_nopasswd-vnf + initial-config-primitive: + - name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + seq: '1' + - name: touch + parameter: + - name: filename + value: /home/ubuntu/first-touch + seq: '2' + juju: + charm: simple ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -93,30 +121,3 @@ vnfd: size-of-storage: 10 - id: dataVM-storage size-of-storage: 10 - vnf-configuration: - - config-access: - ssh-access: - default-user: ubuntu - required: true - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: /home/ubuntu/touched - name: filename - id: default-vnf-configuration - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - seq: '1' - - name: touch - parameter: - - name: filename - value: /home/ubuntu/first-touch - seq: '2' - juju: - charm: simple diff --git a/snmp_ee_vnf/snmp_ee_vnfd.yaml b/snmp_ee_vnf/snmp_ee_vnfd.yaml index 11354a8b..0eb93f1d 100644 --- a/snmp_ee_vnf/snmp_ee_vnfd.yaml +++ b/snmp_ee_vnf/snmp_ee_vnfd.yaml @@ -10,7 +10,32 @@ vnfd: vdu-profile: - id: vyos-VM min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-primitive: + - execution-environment-ref: monitor + name: generate_snmp + execution-environment-list: + - connection-point-ref: vnf-mgmt + helm-chart: eechart + id: monitor + metric-service: snmpexporter + id: snmp_ee-vnf + initial-config-primitive: + - execution-environment-ref: monitor + name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: osm + - name: ssh-password + value: osm2020 + seq: 1 + - execution-environment-ref: monitor + name: generate_snmp + seq: 2 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -70,27 +95,3 @@ vnfd: virtual-storage-desc: - id: vyos-VM-storage size-of-storage: 10 - vnf-configuration: - - config-primitive: - - execution-environment-ref: monitor - name: generate_snmp - execution-environment-list: - - connection-point-ref: vnf-mgmt - helm-chart: eechart - id: monitor - metric-service: snmpexporter - id: default-vnf-configuration - initial-config-primitive: - - execution-environment-ref: monitor - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: osm - - name: ssh-password - value: osm2020 - seq: 1 - - execution-environment-ref: monitor - name: generate_snmp - seq: 2 diff --git a/snmp_setcomm_ee_vnf/snmp_setcomm_ee_vnfd.yaml b/snmp_setcomm_ee_vnf/snmp_setcomm_ee_vnfd.yaml index 5f478a80..3e948849 100644 --- a/snmp_setcomm_ee_vnf/snmp_setcomm_ee_vnfd.yaml +++ b/snmp_setcomm_ee_vnf/snmp_setcomm_ee_vnfd.yaml @@ -10,7 +10,47 @@ vnfd: vdu-profile: - id: vyos-VM min-number-of-instances: 1 - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-primitive: + - execution-environment-ref: monitor + name: generate_snmp + - execution-environment-primitive: ansible_playbook + execution-environment-ref: monitor + name: ansible_playbook + parameter: + - data-type: STRING + default-value: playbook.yaml + name: playbook-name + execution-environment-list: + - connection-point-ref: vnf-mgmt + helm-chart: eechart + id: monitor + metric-service: snmpexporter + id: snmp_setcomm_ee-vnf + initial-config-primitive: + - execution-environment-ref: monitor + name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: osm + - name: ssh-password + value: osm2020 + seq: 1 + - execution-environment-ref: monitor + name: generate_snmp + seq: 2 + - execution-environment-ref: monitor + name: ansible_playbook + parameter: + - name: playbook-name + value: community.yaml + - name: snmp_community + value: secret + seq: 3 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -70,42 +110,3 @@ vnfd: virtual-storage-desc: - id: vyos-VM-storage size-of-storage: 10 - vnf-configuration: - - config-primitive: - - execution-environment-ref: monitor - name: generate_snmp - - execution-environment-primitive: ansible_playbook - execution-environment-ref: monitor - name: ansible_playbook - parameter: - - data-type: STRING - default-value: playbook.yaml - name: playbook-name - execution-environment-list: - - connection-point-ref: vnf-mgmt - helm-chart: eechart - id: monitor - metric-service: snmpexporter - id: default-vnf-configuration - initial-config-primitive: - - execution-environment-ref: monitor - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: osm - - name: ssh-password - value: osm2020 - seq: 1 - - execution-environment-ref: monitor - name: generate_snmp - seq: 2 - - execution-environment-ref: monitor - name: ansible_playbook - parameter: - - name: playbook-name - value: community.yaml - - name: snmp_community - value: secret - seq: 3 diff --git a/vdu_replicas_vnf/vdu_replicas_vnfd.yaml b/vdu_replicas_vnf/vdu_replicas_vnfd.yaml index 5b24362f..8c7fbc1e 100644 --- a/vdu_replicas_vnf/vdu_replicas_vnfd.yaml +++ b/vdu_replicas_vnf/vdu_replicas_vnfd.yaml @@ -34,7 +34,14 @@ vnfd: description: internal data ip-version: ipv4 name: interdata-l3-protocol-data - vnf-configuration-id: default-vnf-configuration + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - config-access: + ssh-access: + default-user: ubuntu + required: true + id: vdu-replicas-vnf ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -121,9 +128,3 @@ vnfd: size-of-storage: 10 - id: dataVM-storage size-of-storage: 10 - vnf-configuration: - - config-access: - ssh-access: - default-user: ubuntu - required: true - id: default-vnf-configuration -- GitLab From 14300b5bc29e02bd6162dcc6494935979b15ec1d Mon Sep 17 00:00:00 2001 From: bravof Date: Wed, 17 Feb 2021 16:19:56 -0300 Subject: [PATCH 2/4] feat(configuration): OSM-Packages with new way to store configurations Signed-off-by: bravof --- magma/squid_cnf/squid_vnfd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magma/squid_cnf/squid_vnfd.yaml b/magma/squid_cnf/squid_vnfd.yaml index 7b9348ac..424020af 100644 --- a/magma/squid_cnf/squid_vnfd.yaml +++ b/magma/squid_cnf/squid_vnfd.yaml @@ -5,7 +5,7 @@ vnfd: lcm-operations-configuration: operate-vnf-op-config: day1-2: - - id: + - id: squid-kdu config-primitive: - name: addurl parameter: -- GitLab From 7aa3ace183b2ec48b2799e95f53b7d0d55182760 Mon Sep 17 00:00:00 2001 From: bravof Date: Fri, 19 Feb 2021 11:30:02 -0300 Subject: [PATCH 3/4] fix(juju): juju using new EE-container --- .../ha_proxy_charm_vnfd.yaml | 9 ++++-- .../k8s_proxy_charm_vnfd.yaml | 11 +++++-- .../native_charm_vnf/native_charm_vnfd.yaml | 10 +++++-- .../nopasswd_k8s_proxy_charm_vnfd.yaml | 11 +++++-- .../nopasswd_proxy_charm_vnfd.yaml | 9 ++++-- .../ns_relations_provides_vnfd.yaml | 10 +++++-- .../ns_relations_requires_vnfd.yaml | 10 +++++-- .../proxy_native_relation_vnfd.yaml | 21 ++++++++++---- .../vnf_relations_vnf/vnf_relations_vnfd.yaml | 20 +++++++++---- .../hackfest_k8sproxycharm_vnfd.yaml | 13 ++++++--- .../hackfest_proxycharm_vnfd.yaml | 9 ++++-- .../k8s_jujucontroller_vnfd.yaml | 29 +++++++++++++++++-- .../hackfest_gateway_vnfd.yaml | 8 +++-- .../magma-agw-enb_vnfd.yaml | 28 ++++++++++++++---- nscharm_policy_vnf/nscharm_policy_vnfd.yaml | 9 ++++-- nscharm_user_vnf/nscharm_user_vnfd.yaml | 9 ++++-- simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml | 9 ++++-- 17 files changed, 171 insertions(+), 54 deletions(-) diff --git a/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml b/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml index 0a23b2f9..2b6ebd28 100644 --- a/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml +++ b/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml @@ -19,18 +19,24 @@ vnfd: operate-vnf-op-config: day1-2: - id: ha_proxy_charm-vnf + execution-environment-list: + - id: simple-ee + juju: + charm: simple config-access: ssh-access: default-user: ubuntu required: true config-primitive: - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename initial-config-primitive: - name: config + execution-environment-ref: simple-ee parameter: - name: ssh-hostname value: @@ -40,13 +46,12 @@ vnfd: value: osm4u seq: 1 - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: 2 - juju: - charm: simple ext-cpd: - id: vnf-mgmt-ext int-cpd: diff --git a/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml b/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml index c6e77234..30f617e8 100644 --- a/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml +++ b/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml @@ -16,6 +16,7 @@ vnfd: day1-2: - config-primitive: - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched @@ -24,9 +25,15 @@ vnfd: ssh-access: default-user: ubuntu required: true + execution-environment-list: + - id: simple-ee + juju: + charm: simple + cloud: k8s id: k8s_proxy_charm-vnf initial-config-primitive: - name: config + execution-environment-ref: simple-ee parameter: - name: ssh-hostname value: @@ -36,14 +43,12 @@ vnfd: value: osm4u seq: 1 - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: 2 - juju: - charm: simple - cloud: k8s ext-cpd: - id: vnf-mgmt-ext int-cpd: diff --git a/charm-packages/native_charm_vnf/native_charm_vnfd.yaml b/charm-packages/native_charm_vnf/native_charm_vnfd.yaml index 553176df..e037d32a 100644 --- a/charm-packages/native_charm_vnf/native_charm_vnfd.yaml +++ b/charm-packages/native_charm_vnf/native_charm_vnfd.yaml @@ -20,21 +20,25 @@ vnfd: required: true config-primitive: - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename id: mgmtVM + execution-environment-list: + - id: simple-ee + juju: + charm: simple + proxy: false initial-config-primitive: - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: 1 - juju: - charm: simple - proxy: false ext-cpd: - id: vnf-mgmt-ext int-cpd: diff --git a/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml b/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml index 38f7585c..bf32376c 100644 --- a/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml +++ b/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml @@ -20,13 +20,20 @@ vnfd: required: true config-primitive: - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename id: nopasswd_k8s_proxy_charm-vnf + execution-environment-list: + - id: simple-ee + juju: + charm: simple + cloud: k8s initial-config-primitive: - name: config + execution-environment-ref: simple-ee parameter: - name: ssh-hostname value: @@ -34,14 +41,12 @@ vnfd: value: ubuntu seq: 1 - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: 2 - juju: - charm: simple - cloud: k8s ext-cpd: - id: vnf-mgmt-ext int-cpd: diff --git a/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml b/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml index 02dd5fbf..0777117a 100644 --- a/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml +++ b/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml @@ -20,13 +20,19 @@ vnfd: required: true config-primitive: - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename id: nopasswd_proxy_charm-vnf + execution-environment-list: + - id: simple-ee + juju: + charm: simple initial-config-primitive: - name: config + execution-environment-ref: simple-ee parameter: - name: ssh-hostname value: @@ -34,13 +40,12 @@ vnfd: value: ubuntu seq: 1 - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: 2 - juju: - charm: simple ext-cpd: - id: vnf-mgmt-ext int-cpd: diff --git a/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml b/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml index 7173b52d..ceb8d295 100644 --- a/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml +++ b/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml @@ -20,21 +20,25 @@ vnfd: required: true config-primitive: - name: touch + execution-environment-ref: simple-provides-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename id: ns_relations_provides-vnf + execution-environment-list: + - id: simple-provides-ee + juju: + charm: simple_provides + proxy: false initial-config-primitive: - name: touch + execution-environment-ref: simple-provides-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: 1 - juju: - charm: simple_provides - proxy: false ext-cpd: - id: provides-mgmt-ext int-cpd: diff --git a/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml b/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml index d33bd8b5..b4c45c04 100644 --- a/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml +++ b/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml @@ -20,21 +20,25 @@ vnfd: required: true config-primitive: - name: touch + execution-environment-ref: simple-requires-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename id: ns_relations_requires-vnf + execution-environment-list: + - id: simple-requires-ee + juju: + charm: simple_requires + proxy: false initial-config-primitive: - name: touch + execution-environment-ref: simple-requires-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: 1 - juju: - charm: simple_requires - proxy: false ext-cpd: - id: requires-mgmt-ext int-cpd: diff --git a/charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml b/charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml index 550c7e97..1cb35a36 100644 --- a/charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml +++ b/charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml @@ -24,13 +24,20 @@ vnfd: required: true config-primitive: - name: touch + execution-environment-ref: simple-provides-proxy-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename id: proxy_native_relation-vnf + execution-environment-list: + - id: simple-provides-proxy-ee + juju: + charm: simple_provides_proxy + proxy: true initial-config-primitive: - name: config + execution-environment-ref: simple-provides-proxy-ee parameter: - name: ssh-hostname value: @@ -38,14 +45,12 @@ vnfd: value: ubuntu seq: 1 - name: touch + execution-environment-ref: simple-provides-proxy-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: 2 - juju: - charm: simple_provides_proxy - proxy: true relation: - entities: - endpoint: interface @@ -59,21 +64,25 @@ vnfd: required: true config-primitive: - name: touch + execution-environment-ref: simple-requires-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename id: simple_requires + execution-environment-list: + - id: simple-requires-ee + juju: + charm: simple_requires + proxy: false initial-config-primitive: - name: touch + execution-environment-ref: simple-requires-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: 1 - juju: - charm: simple_requires - proxy: false ext-cpd: - id: requires-mgmt-ext int-cpd: diff --git a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml index 28ce0448..35c0c029 100644 --- a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml +++ b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml @@ -32,42 +32,50 @@ vnfd: required: true config-primitive: - name: touch + execution-environment-ref: simple-requires-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename id: simple_requires + execution-environment-list: + - id: simple-requires-ee + juju: + charm: simple_requires + proxy: false initial-config-primitive: - name: touch + execution-environment-ref: simple-requires-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: 1 - juju: - charm: simple_requires - proxy: false - config-access: ssh-access: default-user: ubuntu required: true config-primitive: - name: touch + execution-environment-ref: simple-provides-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename id: simple_provides + execution-environment-list: + - id: simple-provides-ee + juju: + charm: simple_provides + proxy: false initial-config-primitive: - name: touch + execution-environment-ref: simple-provides-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: 1 - juju: - charm: simple_provides - proxy: false ext-cpd: - id: requires-mgmt-ext int-cpd: diff --git a/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml b/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml index f29c80fd..cdf10329 100644 --- a/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml +++ b/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml @@ -16,13 +16,21 @@ vnfd: day1-2: - config-primitive: - name: touch + execution-environment-ref: simple-k8s-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename id: hackfest_k8sproxycharm-vnf + execution-environment-list: + - id: simple-k8s-ee + juju: + charm: charm-simple-k8s + cloud: k8s + proxy: true initial-config-primitive: - name: config + execution-environment-ref: simple-k8s-ee parameter: - name: ssh-hostname value: @@ -32,15 +40,12 @@ vnfd: value: osm4u seq: '1' - name: touch + execution-environment-ref: simple-k8s-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: '2' - juju: - charm: charm-simple-k8s - cloud: k8s - proxy: true ext-cpd: - id: vnf-mgmt-ext int-cpd: diff --git a/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml b/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml index 4421ba1a..e058bfee 100644 --- a/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml +++ b/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml @@ -16,17 +16,23 @@ vnfd: day1-2: - config-primitive: - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename id: hackfest_proxycharm-vnf + execution-environment-list: + - id: simple-ee + juju: + charm: simple config-access: ssh-access: default-user: ubuntu required: true initial-config-primitive: - name: config + execution-environment-ref: simple-ee parameter: - name: ssh-hostname value: @@ -36,13 +42,12 @@ vnfd: value: osm4u seq: 1 - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch seq: 2 - juju: - charm: simple ext-cpd: - id: vnf-mgmt-ext int-cpd: diff --git a/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml b/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml index 9ffd11f6..aa366211 100644 --- a/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml +++ b/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml @@ -17,23 +17,37 @@ vnfd: ssh-access: default-user: ubuntu required: true + execution-environment-list: + - id: tid-jujuk8s-ee + juju: + charm: tid-jujuk8s config-primitive: - name: setup-juju + execution-environment-ref: tid-jujuk8s-ee - name: deploy-bundle + execution-environment-ref: tid-jujuk8s-ee parameter: - data-type: STRING name: bundle - name: undeploy-bundle + execution-environment-ref: tid-jujuk8s-ee - name: remove-machines + execution-environment-ref: tid-jujuk8s-ee - name: init-helm + execution-environment-ref: tid-jujuk8s-ee - name: install-openebs-chart + execution-environment-ref: tid-jujuk8s-ee - name: install-openebs-kubectl + execution-environment-ref: tid-jujuk8s-ee - name: post-deploy + execution-environment-ref: tid-jujuk8s-ee - name: add-machine + execution-environment-ref: tid-jujuk8s-ee parameter: - data-type: STRING name: machine - name: add-machines + execution-environment-ref: tid-jujuk8s-ee parameter: - data-type: STRING name: machine1 @@ -56,20 +70,24 @@ vnfd: - data-type: STRING name: machine10 - name: remove-machines + execution-environment-ref: tid-jujuk8s-ee parameter: - data-type: STRING name: force - name: add-repo + execution-environment-ref: tid-jujuk8s-ee parameter: - data-type: STRING name: name - data-type: STRING name: url - name: remove-repo + execution-environment-ref: tid-jujuk8s-ee parameter: - data-type: STRING name: name - name: install-chart + execution-environment-ref: tid-jujuk8s-ee parameter: - data-type: STRING name: chart @@ -84,6 +102,7 @@ vnfd: - data-type: STRING name: valuesFile - name: upgrade-release + execution-environment-ref: tid-jujuk8s-ee parameter: - data-type: STRING name: chart @@ -98,18 +117,21 @@ vnfd: - data-type: STRING name: valuesFile - name: rollback-release + execution-environment-ref: tid-jujuk8s-ee parameter: - data-type: STRING name: name - data-type: STRING name: revision - name: delete-release + execution-environment-ref: tid-jujuk8s-ee parameter: - data-type: STRING name: name id: k8s_jujucontroller_vnf initial-config-primitive: - name: config + execution-environment-ref: tid-jujuk8s-ee parameter: - name: ssh-hostname value: @@ -117,8 +139,10 @@ vnfd: value: ubuntu seq: '1' - name: setup-juju + execution-environment-ref: tid-jujuk8s-ee seq: '2' - name: add-machines + execution-environment-ref: tid-jujuk8s-ee parameter: - name: machine1 value: @@ -142,16 +166,17 @@ vnfd: value: seq: '3' - name: deploy-bundle + execution-environment-ref: tid-jujuk8s-ee parameter: - name: bundle value: seq: '4' - name: post-deploy + execution-environment-ref: tid-jujuk8s-ee seq: '5' - name: install-openebs-kubectl + execution-environment-ref: tid-jujuk8s-ee seq: '6' - juju: - charm: tid-jujuk8s ext-cpd: - id: mgmt-ext int-cpd: diff --git a/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml b/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml index 6fe1bcf0..f2cf5089 100644 --- a/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml +++ b/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml @@ -15,17 +15,23 @@ vnfd: day1-2: - config-primitive: - name: configure-remote + execution-environment-ref: vyos-config-ee parameter: - data-type: STRING default-value: 0.0.0.0 name: magmaIP id: hackfest_gateway_vnfd + execution-environment-list: + - id: vyos-config-ee + juju: + charm: vyos-config config-access: ssh-access: default-user: osm required: true initial-config-primitive: - name: config + execution-environment-ref: vyos-config-ee parameter: - name: ssh-username value: osm @@ -34,8 +40,6 @@ vnfd: - name: ssh-hostname value: seq: 1 - juju: - charm: vyos-config ext-cpd: - id: gateway_public-ext int-cpd: diff --git a/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml b/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml index 26cc6a87..8c955dae 100644 --- a/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml +++ b/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml @@ -63,6 +63,7 @@ vnfd: required: true config-primitive: - name: add-gw + execution-environment-ref: magmagw-ee parameter: - default-value: name: agw_id @@ -73,6 +74,7 @@ vnfd: - default-value: name: orch_net - name: del-gw + execution-environment-ref: magmagw-ee parameter: - default-value: name: agw_id @@ -81,10 +83,17 @@ vnfd: - default-value: name: orch_net - name: reset-id + execution-environment-ref: magmagw-ee - name: restart-magma + execution-environment-ref: magmagw-ee id: magma-agw-vdu + execution-environment-list: + - id: magmagw-ee + juju: + charm: magmagw initial-config-primitive: - name: config + execution-environment-ref: magmagw-ee parameter: - name: ssh-hostname value: @@ -94,8 +103,10 @@ vnfd: value: magma seq: 1 - name: reset-id + execution-environment-ref: magmagw-ee seq: 2 - name: add-net + execution-environment-ref: magmagw-ee parameter: - name: orch_ip value: @@ -103,6 +114,7 @@ vnfd: value: seq: 3 - name: add-gw + execution-environment-ref: magmagw-ee parameter: - name: agw_id value: @@ -114,6 +126,7 @@ vnfd: value: seq: 4 - name: add-test-subscriber + execution-environment-ref: magmagw-ee parameter: - name: orch_ip value: @@ -121,20 +134,21 @@ vnfd: value: seq: 5 - name: add-hosts + execution-environment-ref: magmagw-ee parameter: - name: orch_ip value: seq: 6 - name: restart-magma + execution-environment-ref: magmagw-ee seq: 7 - juju: - charm: magmagw - config-access: ssh-access: default-user: ubuntu required: true config-primitive: - name: attach-ue + execution-environment-ref: srs-enb-ue-ee parameter: - data-type: STRING name: usim-imsi @@ -143,16 +157,20 @@ vnfd: - data-type: STRING name: usim-opc - name: detach-ue + execution-environment-ref: srs-enb-ue-ee id: srsLTE-vdu + execution-environment-list: + - id: srs-enb-ue-ee + juju: + charm: srs-enb-ue + proxy: false initial-config-primitive: - name: config + execution-environment-ref: srs-enb-ue-ee parameter: - name: bind-address-subnet value: 192.168.100.0/24 seq: 1 - juju: - charm: srs-enb-ue - proxy: false ext-cpd: - id: agw-sgi-ext int-cpd: diff --git a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml index 4cc930cb..ca1030e0 100644 --- a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml +++ b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml @@ -14,8 +14,14 @@ vnfd: operate-vnf-op-config: day1-2: - id: policyVM + execution-environment-list: + - id: vnf-policy-ee + juju: + charm: vnf-policy + proxy: true initial-config-primitive: - name: config + execution-environment-ref: vnf-policy-ee parameter: - name: ssh-hostname value: @@ -24,9 +30,6 @@ vnfd: - name: ssh-password value: osm4u seq: '1' - juju: - charm: vnf-policy - proxy: true ext-cpd: - id: vnf-mgmt-ext int-cpd: diff --git a/nscharm_user_vnf/nscharm_user_vnfd.yaml b/nscharm_user_vnf/nscharm_user_vnfd.yaml index 87ff8dda..7859261f 100644 --- a/nscharm_user_vnf/nscharm_user_vnfd.yaml +++ b/nscharm_user_vnf/nscharm_user_vnfd.yaml @@ -14,8 +14,14 @@ vnfd: operate-vnf-op-config: day1-2: - id: userVM + execution-environment-list: + - id: vnf-user-ee + juju: + charm: vnf-user + proxy: true initial-config-primitive: - name: config + execution-environment-ref: vnf-user-ee parameter: - name: ssh-hostname value: @@ -24,9 +30,6 @@ vnfd: - name: ssh-password value: osm4u seq: '1' - juju: - charm: vnf-user - proxy: true ext-cpd: - id: vnf-mgmt-ext int-cpd: diff --git a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml index f94854a9..45cb1175 100644 --- a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml +++ b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml @@ -24,13 +24,19 @@ vnfd: required: true config-primitive: - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING default-value: /home/ubuntu/touched name: filename id: simple_nopasswd-vnf + execution-environment-list: + - id: simple-ee + juju: + charm: simple initial-config-primitive: - name: config + execution-environment-ref: simple-ee parameter: - name: ssh-hostname value: @@ -38,12 +44,11 @@ vnfd: value: ubuntu seq: '1' - name: touch + execution-environment-ref: simple-ee parameter: - name: filename value: /home/ubuntu/first-touch seq: '2' - juju: - charm: simple ext-cpd: - id: vnf-mgmt-ext int-cpd: -- GitLab From 7b421dc063d015bb38232206fc68cadfb640a853 Mon Sep 17 00:00:00 2001 From: bravof Date: Fri, 19 Feb 2021 12:51:39 -0300 Subject: [PATCH 4/4] fix(juju): identation in simple_nopasswd descriptor Signed-off-by: bravof --- simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml index 45cb1175..d94d716e 100644 --- a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml +++ b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml @@ -31,9 +31,9 @@ vnfd: name: filename id: simple_nopasswd-vnf execution-environment-list: - - id: simple-ee - juju: - charm: simple + - id: simple-ee + juju: + charm: simple initial-config-primitive: - name: config execution-environment-ref: simple-ee -- GitLab