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 cede95f0c5e647662a9343a25a185a40ee3b19a8..2b6ebd280767b74ac002568c9314005da9c13493 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,43 @@ 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 + 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: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: osm4u + seq: 1 + - name: touch + execution-environment-ref: simple-ee + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 2 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -50,7 +86,6 @@ vnfd: virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage - virtual-compute-desc: - id: mgmtVM-compute virtual-cpu: @@ -59,34 +94,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 5a844ef608e7b5e59c62239a4b1eda95068dae85..30f617e8ade1d467db87a2120bd15f31c259cf30 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,44 @@ 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 + execution-environment-ref: simple-ee + parameter: + - data-type: STRING + default-value: /home/ubuntu/touched + name: filename + config-access: + 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: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: osm4u + seq: 1 + - name: touch + execution-environment-ref: simple-ee + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 2 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -58,35 +95,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 1c6cb9c473b7111d0eb2c13a8f3b0ef47101e834..e037d32a5c2f53f533917b2b8352c5b6a200e6a7 100644 --- a/charm-packages/native_charm_vnf/native_charm_vnfd.yaml +++ b/charm-packages/native_charm_vnf/native_charm_vnfd.yaml @@ -11,7 +11,34 @@ 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 + 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 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -49,28 +76,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 6f4da557e4d9dd65e23e2d626ead0741e80908c6..35d47caece1a1e997851b5da1f1ed5e417850524 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 28a770fe876ed06245c225bfa855eefd0675d1a1..bf32376cd9ac6f66e1fbf1887757a0cd1295400a 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,42 @@ 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 + 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: + - name: ssh-username + value: ubuntu + seq: 1 + - name: touch + execution-environment-ref: simple-ee + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 2 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -59,32 +94,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 c86a8767fc799743ddb88dfbd13a2c146b28339b..0777117a3badad9fed67ad3ba15fcb0a4d8db28e 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,41 @@ 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 + 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: + - name: ssh-username + value: ubuntu + seq: 1 + - name: touch + execution-environment-ref: simple-ee + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 2 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -59,31 +93,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 06e2fde7c6d6b20ceb78c854896d581e983437e0..ceb8d2953d130cd2bcface10873b9566779f508c 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,34 @@ 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 + 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 ext-cpd: - id: provides-mgmt-ext int-cpd: @@ -49,25 +76,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 cf61060ad536283aa88f37576a49ce61c88d140d..b4c45c0411925f63587156717ce13170700953f1 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,34 @@ 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 + 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 ext-cpd: - id: requires-mgmt-ext int-cpd: @@ -49,25 +76,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 d0789e5fa7b173b3c6ecbbda2f7a3d90da808c5c..1cb35a36b8900b21c7a0c31eb14d74cd24dd91b2 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,76 @@ 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 + 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: + - name: ssh-username + 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 + 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 + 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 ext-cpd: - id: requires-mgmt-ext int-cpd: @@ -62,28 +128,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 +145,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 c38755fbcc28a90db95920510ab36f37fc17c974..35c0c02980b16582c910ae9987b342394d915895 100644 --- a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml +++ b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml @@ -13,11 +13,69 @@ 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 + 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 + - 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 ext-cpd: - id: requires-mgmt-ext int-cpd: @@ -63,49 +121,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 +138,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 903d8844540744832d2301b2836959dea78e0fe3..cdf103295da96cd171a1232321f0178ab38dc6cb 100644 --- a/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml +++ b/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml @@ -11,7 +11,41 @@ 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 + 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: + - name: ssh-username + value: ubuntu + - name: ssh-password + 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' ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -59,31 +93,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 b017e0776f2d31bfd57d90f3b54ada07e5b6058f..e058bfee7876caf5a23a37693b05f93dbdc30d0e 100644 --- a/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml +++ b/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml @@ -11,7 +11,43 @@ 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 + 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: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: osm4u + seq: 1 + - name: touch + execution-environment-ref: simple-ee + parameter: + - data-type: STRING + name: filename + value: /home/ubuntu/first-touch + seq: 2 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -59,33 +95,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 f60b652ae303eb8e49b62f7f6ac47f9d46a3a4d8..aa36621116197adecdd6c7cdf9c704f0b2b66a5f 100644 --- a/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml +++ b/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml @@ -10,7 +10,173 @@ 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 + 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 + - 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 + 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 + - 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 + execution-environment-ref: tid-jujuk8s-ee + 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 + 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: + - name: ssh-username + 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: + - 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 + 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' ext-cpd: - id: mgmt-ext int-cpd: @@ -48,143 +214,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 40a8255bb2d00574784c81ddedd06d283ecec763..f2cf5089214b86e6cc75496dbbe696d4693a909a 100644 --- a/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml +++ b/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml @@ -10,7 +10,36 @@ 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 + 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 + - name: ssh-password + value: osm2020 + - name: ssh-hostname + value: + seq: 1 ext-cpd: - id: gateway_public-ext int-cpd: @@ -28,27 +57,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 d5efb43b3308bc37e7a55041efa059cd1bc97f51..8c955dae81eb186f284849ba96f15936a321cc22 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,130 @@ 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 + execution-environment-ref: magmagw-ee + parameter: + - default-value: + name: agw_id + - default-value: + name: agw_name + - default-value: + name: orch_ip + - default-value: + name: orch_net + - name: del-gw + execution-environment-ref: magmagw-ee + parameter: + - default-value: + name: agw_id + - default-value: + name: orch_ip + - 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: + - name: ssh-username + value: magma + - name: ssh-password + 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: + - name: orch_net + value: + seq: 3 + - name: add-gw + execution-environment-ref: magmagw-ee + parameter: + - name: agw_id + value: + - name: agw_name + value: + - name: orch_ip + value: + - name: orch_net + value: + seq: 4 + - name: add-test-subscriber + execution-environment-ref: magmagw-ee + parameter: + - name: orch_ip + value: + - name: orch_net + 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 + - 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 + - data-type: STRING + name: usim-k + - 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 ext-cpd: - id: agw-sgi-ext int-cpd: @@ -146,102 +267,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 +284,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 629333ae089ec78854d55103bb2c32184827a2e4..424020aff05ef6304160e7abfd9606ed52d22fca 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: squid-kdu + 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 ff3166a22b0c92a93a20e6e67776c1918683c64b..ca1030e094f7f6d49cd7183e5acff52065c1f9cd 100644 --- a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml +++ b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml @@ -10,7 +10,26 @@ 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 + 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: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: osm4u + seq: '1' ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -47,21 +66,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 73059b35e085b0d14ea99e6e85068f21e2309790..7859261fc12c920132301b8ec61fefc37b0fb52d 100644 --- a/nscharm_user_vnf/nscharm_user_vnfd.yaml +++ b/nscharm_user_vnf/nscharm_user_vnfd.yaml @@ -10,7 +10,26 @@ 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 + 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: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: osm4u + seq: '1' ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -47,21 +66,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 6be9c35f2ba0e3b835c60e0630c002a207858efe..d90fb6b2275e70207add2329a2362554d5229242 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 716bce9394362ca9ec1c0fe0716654ef5d165d3e..d94d716ef499157f6c0aa71c950351d0d50962de 100644 --- a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml +++ b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml @@ -15,7 +15,40 @@ 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 + 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: + - name: ssh-username + value: ubuntu + seq: '1' + - name: touch + execution-environment-ref: simple-ee + parameter: + - name: filename + value: /home/ubuntu/first-touch + seq: '2' ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -93,30 +126,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 11354a8b562bb560ac6f17f26b3c2d4a193b3073..0eb93f1def43260a6d913e8c6f5aa0447b25265e 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 5f478a80fa75df3309e983a77de00328e082775f..3e948849e1a9c4204925aef8d7e44450a7f66946 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 5b24362f2dd9f1eae5169bb243af966074f3145c..8c7fbc1eb806723591690bd7dbb15d9014cdd962 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