From bb39f86b349f6edccc2d14719d65567972cbf55b Mon Sep 17 00:00:00 2001 From: aguilard Date: Tue, 29 Mar 2022 14:50:18 +0000 Subject: [PATCH] Renamed deprecated identifiers such as '1' in 'vnf-profile' section. Removed quotes in YAML descriptor files. --- .../cmr_relation_ns/cmr_relation_nsd.yaml | 4 ++-- .../ha_proxy_charm_ns/ha_proxy_charm_nsd.yaml | 16 ++++++++-------- .../ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml | 6 +++--- .../k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml | 16 ++++++++-------- .../native_charm_centos_nsd.yaml | 8 ++++---- .../native_charm_ns/native_charm_nsd.yaml | 16 ++++++++-------- .../native_k8s_charm_nsd.yaml | 2 +- .../native_k8s_scale_charm_nsd.yaml | 2 +- .../native_charm_nsd.yaml | 10 +++++----- .../nopasswd_k8s_proxy_charm_nsd.yaml | 16 ++++++++-------- .../nopasswd_proxy_charm_nsd.yaml | 16 ++++++++-------- .../ns_relations_ns/ns_relations_nsd.yaml | 16 ++++++++-------- charm-packages/pebble_charm_ns/pebble_nsd.yaml | 2 +- .../proxy_native_relation_nsd.yaml | 10 +++++----- .../sol007_k8s_proxy_charm_nsd.yaml | 16 ++++++++-------- .../vnf_relations_ns/vnf_relations_nsd.yaml | 10 +++++----- cirros_alarm_ns/cirros_alarm_nsd.yaml | 6 +++--- cirros_alarm_vnf/cirros_alarm_vnfd.yaml | 2 +- .../epa_1vm_passthrough_nsd.yaml | 14 +++++++------- .../epa_1vm_passthrough_vnfd.yaml | 2 +- epa_1vm_sriov_ns/epa_1vm_sriov_nsd.yaml | 14 +++++++------- epa_1vm_sriov_vnf/epa_1vm_sriov_vnfd.yaml | 2 +- epa_2vm_sriov_ns/epa_2vm_sriov_nsd.yaml | 14 +++++++------- epa_2vm_sriov_vnf/epa_2vm_sriov_vnfd.yaml | 2 +- epa_quota_ns/epa_quota_nsd.yaml | 6 +++--- epa_quota_vnf/epa_quota_vnfd.yaml | 2 +- ..._nsd.yaml => hackfest_basic_metrics_nsd.yaml} | 6 +++--- .../hackfest_basic_metrics_vnfd.yaml | 10 +++++----- hackfest_basic_ns/hackfest_basic_nsd.yaml | 6 +++--- .../hackfest_basic_sriov_nsd.yaml | 8 ++++---- .../hackfest_basic_sriov_vnfd.yaml | 2 +- hackfest_basic_vnf/hackfest_basic_vnfd.yaml | 8 ++++---- .../hackfest_cloudinit_nsd.yaml | 14 +++++++------- .../hackfest_cloudinit_vnfd.yaml | 14 +++++++------- hackfest_epasriov_ns/hackfest_epasriov_nsd.yaml | 14 +++++++------- .../hackfest_epasriov_vnfd.yaml | 2 +- .../hackfest_firewall_pnfd.yaml | 2 +- .../hackfest_firewall_pnf_nsd.yaml | 2 +- .../hackfest_k8sproxycharm_nsd.yaml | 14 +++++++------- .../hackfest_k8sproxycharm_vnfd.yaml | 6 +++--- hackfest_multivdu_ns/hackfest_multivdu_nsd.yaml | 14 +++++++------- .../hackfest_multivdu_vnfd.yaml | 2 +- .../hackfest_simplecharm_nsd.yaml | 14 +++++++------- .../hackfest_proxycharm_vnfd.yaml | 2 +- .../hackfest_simple_k8s_nsd.yaml | 6 +++--- .../hackfest_virtual-pc_nsd.yaml | 10 +++++----- hackfest_virtual-pc_vnfd/virtual-pc_vnfd.yaml | 2 +- hackfest_vyos_ns/hackfest_vyos_nsd.yaml | 10 +++++----- hackfest_vyos_vnf/hackfest_vyos_vnfd.yaml | 2 +- ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml | 6 +++--- ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml | 4 ++-- k8s_juju_ns/k8s_juju_nsd.yaml | 4 ++-- .../k8s_jujucontroller_vnfd.yaml | 12 ++++++------ magma/fb_magma_knf/fb_magma_vnfd.yaml | 2 +- magma/fb_magma_ns/fb_magma_nsd.yaml | 2 +- .../hackfest_gateway_vnfd.yaml | 2 +- .../magma-agw-enb_nsd.yaml | 2 +- .../magma-agw-enb_vnfd.yaml | 2 +- magma/squid_cnf/squid_vnfd.yaml | 2 +- magma/squid_cnf_ns/squid_cnf_nsd.yaml | 2 +- nscharm_ns/nscharm_nsd.yaml | 12 ++++++------ nscharm_policy_vnf/nscharm_policy_vnfd.yaml | 4 ++-- nscharm_user_vnf/nscharm_user_vnfd.yaml | 4 ++-- openldap_knf/openldap_vnfd.yaml | 2 +- openldap_ns/openldap_nsd.yaml | 4 ++-- openldap_scale_knf/openldap_scale_vnfd.yaml | 2 +- openldap_scale_ns/openldap_scale_nsd.yaml | 4 ++-- sample_ee_ns/sample_ee_nsd.yaml | 2 +- sample_ee_vnf/sample_ee_vnfd.yaml | 2 +- several_volumes_ns/several_volumes_nsd.yaml | 2 +- several_volumes_vnf/several_volumes_vnfd.yaml | 12 ++++++------ simple_2vm_ns/simple_2vm_nsd.yaml | 6 +++--- simple_2vm_vnf/simple_2vm_vnfd.yaml | 2 +- simple_ee_vnf/simple_ee_vnfd.yaml | 10 +++++----- simple_nopasswd_ns/simple_nopasswd_nsd.yaml | 8 ++++---- simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml | 6 +++--- .../slice_basic_middle_nsd.yaml | 2 +- .../slice_basic_middle_vnfd.yaml | 2 +- slice_basic_ns/slice_basic_nsd.yaml | 2 +- slice_basic_vnf/slice_basic_vnfd.yaml | 2 +- snmp_ee_ns/snmp_ee_nsd.yaml | 2 +- snmp_ee_vnf/snmp_ee_vnfd.yaml | 2 +- snmp_setcomm_ee_ns/snmp_setcomm_ee_nsd.yaml | 2 +- snmp_setcomm_ee_vnf/snmp_setcomm_ee_vnfd.yaml | 2 +- .../sol004_hackfest_basic_vnfd.yaml | 8 ++++---- .../sol007_hackfest_basic_nsd.yaml | 6 +++--- squid_metrics_cnf_ns/squid_cnf_nsd.yaml | 2 +- ubuntu_4ifaces_ns/ubuntu_4ifaces_nsd.yaml | 2 +- ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml | 2 +- ubuntu_cloudinit_ns/ubuntu_cloudinit_nsd.yaml | 6 +++--- ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml | 2 +- vdu_replicas_ns/vdu_replicas_nsd.yaml | 2 +- vdu_replicas_vnf/vdu_replicas_vnfd.yaml | 4 ++-- .../wiki_webserver_autoscale_nsd.yaml | 8 ++++---- .../wiki_webserver_autoscale_vnfd.yaml | 4 ++-- 95 files changed, 292 insertions(+), 292 deletions(-) rename hackfest_basic_metrics_ns/{hackfest_basic_nsd.yaml => hackfest_basic_metrics_nsd.yaml} (86%) diff --git a/charm-packages/cmr_relation_ns/cmr_relation_nsd.yaml b/charm-packages/cmr_relation_ns/cmr_relation_nsd.yaml index 8c3c6419..c373bff9 100644 --- a/charm-packages/cmr_relation_ns/cmr_relation_nsd.yaml +++ b/charm-packages/cmr_relation_ns/cmr_relation_nsd.yaml @@ -35,10 +35,10 @@ nsd: vnfd-id: cross_model_no_relation-vnf id: cross_model_relation-ns name: cross_model_relation-ns - version: "1.0" + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: "true" + mgmt-network: true vnfd-id: - cross_model_relation-vnf - cross_model_no_relation-vnf diff --git a/charm-packages/ha_proxy_charm_ns/ha_proxy_charm_nsd.yaml b/charm-packages/ha_proxy_charm_ns/ha_proxy_charm_nsd.yaml index b9cb16a0..89bad7fb 100644 --- a/charm-packages/ha_proxy_charm_ns/ha_proxy_charm_nsd.yaml +++ b/charm-packages/ha_proxy_charm_ns/ha_proxy_charm_nsd.yaml @@ -2,36 +2,36 @@ nsd: nsd: - id: ha_proxy_charm-ns name: ha_proxy_charm-ns - version: '1.0' + version: 1.0 description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: ha_proxy_charm-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: ha_proxy_charm-vnf virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true - id: datanet vnfd-id: - ha_proxy_charm-vnf 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 81c67884..e5c2adbe 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 @@ -105,9 +105,9 @@ vnfd: virtual-compute-desc: - id: mgmtVM-compute virtual-cpu: - num-virtual-cpu: "1" + num-virtual-cpu: 1 virtual-memory: - size: "1.0" + size: 1.0 virtual-storage-desc: - id: mgmtVM-storage - size-of-storage: "10" + size-of-storage: 10 diff --git a/charm-packages/k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml b/charm-packages/k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml index beae3243..9b72b51d 100644 --- a/charm-packages/k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml +++ b/charm-packages/k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml @@ -4,34 +4,34 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: k8s_proxy_charm-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: k8s_proxy_charm-vnf id: k8s_proxy_charm-ns name: k8s_proxy_charm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true - id: datanet vnfd-id: - k8s_proxy_charm-vnf diff --git a/charm-packages/native_charm_centos_ns/native_charm_centos_nsd.yaml b/charm-packages/native_charm_centos_ns/native_charm_centos_nsd.yaml index 63e99291..1647d6a0 100644 --- a/charm-packages/native_charm_centos_ns/native_charm_centos_nsd.yaml +++ b/charm-packages/native_charm_centos_ns/native_charm_centos_nsd.yaml @@ -4,19 +4,19 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet vnfd-id: native_charm_centos-vnf id: native_charm_centos-ns name: native_charm_centos-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true - id: datanet vnfd-id: - native_charm_centos-vnf diff --git a/charm-packages/native_charm_ns/native_charm_nsd.yaml b/charm-packages/native_charm_ns/native_charm_nsd.yaml index 43633090..9cfef32e 100644 --- a/charm-packages/native_charm_ns/native_charm_nsd.yaml +++ b/charm-packages/native_charm_ns/native_charm_nsd.yaml @@ -4,34 +4,34 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: native_charm-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: native_charm-vnf id: native_charm-ns name: native_charm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true - id: datanet vnfd-id: - native_charm-vnf diff --git a/charm-packages/native_k8s_charm_ns/native_k8s_charm_nsd.yaml b/charm-packages/native_k8s_charm_ns/native_k8s_charm_nsd.yaml index 96897b94..6ceba238 100644 --- a/charm-packages/native_k8s_charm_ns/native_k8s_charm_nsd.yaml +++ b/charm-packages/native_k8s_charm_ns/native_k8s_charm_nsd.yaml @@ -13,7 +13,7 @@ nsd: vnfd-id: native_k8s_charm-vnf id: native_k8s_charm-ns name: native_k8s_charm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/charm-packages/native_k8s_scale_charm_ns/native_k8s_scale_charm_nsd.yaml b/charm-packages/native_k8s_scale_charm_ns/native_k8s_scale_charm_nsd.yaml index 84df0ed1..8e5b7f0c 100644 --- a/charm-packages/native_k8s_scale_charm_ns/native_k8s_scale_charm_nsd.yaml +++ b/charm-packages/native_k8s_scale_charm_ns/native_k8s_scale_charm_nsd.yaml @@ -13,7 +13,7 @@ nsd: vnfd-id: native_k8s_scale_charm-vnf id: native_k8s_scale_charm-ns name: native_k8s_scale_charm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/charm-packages/native_manual_scale_charm_ns/native_charm_nsd.yaml b/charm-packages/native_manual_scale_charm_ns/native_charm_nsd.yaml index 2754bbd4..66eef6ac 100644 --- a/charm-packages/native_manual_scale_charm_ns/native_charm_nsd.yaml +++ b/charm-packages/native_manual_scale_charm_ns/native_charm_nsd.yaml @@ -4,23 +4,23 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: native_manual_scale_charm-vnf id: native_manual_scale_charm-ns name: native_manual_scale_charm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true - id: datanet vnfd-id: - native_manual_scale_charm-vnf diff --git a/charm-packages/nopasswd_k8s_proxy_charm_ns/nopasswd_k8s_proxy_charm_nsd.yaml b/charm-packages/nopasswd_k8s_proxy_charm_ns/nopasswd_k8s_proxy_charm_nsd.yaml index 8b75bb26..2738e082 100644 --- a/charm-packages/nopasswd_k8s_proxy_charm_ns/nopasswd_k8s_proxy_charm_nsd.yaml +++ b/charm-packages/nopasswd_k8s_proxy_charm_ns/nopasswd_k8s_proxy_charm_nsd.yaml @@ -4,34 +4,34 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: nopasswd_k8s_proxy_charm-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: nopasswd_k8s_proxy_charm-vnf id: nopasswd_k8s_proxy_charm-ns name: nopasswd_k8s_proxy_charm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true - id: datanet vnfd-id: - nopasswd_k8s_proxy_charm-vnf diff --git a/charm-packages/nopasswd_proxy_charm_ns/nopasswd_proxy_charm_nsd.yaml b/charm-packages/nopasswd_proxy_charm_ns/nopasswd_proxy_charm_nsd.yaml index 859525be..d7c31aad 100644 --- a/charm-packages/nopasswd_proxy_charm_ns/nopasswd_proxy_charm_nsd.yaml +++ b/charm-packages/nopasswd_proxy_charm_ns/nopasswd_proxy_charm_nsd.yaml @@ -4,34 +4,34 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: nopasswd_proxy_charm-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: nopasswd_proxy_charm-vnf id: nopasswd_proxy_charm-ns name: nopasswd_proxy_charm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true - id: datanet vnfd-id: - nopasswd_proxy_charm-vnf diff --git a/charm-packages/ns_relations_ns/ns_relations_nsd.yaml b/charm-packages/ns_relations_ns/ns_relations_nsd.yaml index 6a10331c..cd694c98 100644 --- a/charm-packages/ns_relations_ns/ns_relations_nsd.yaml +++ b/charm-packages/ns_relations_ns/ns_relations_nsd.yaml @@ -4,26 +4,26 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: provides-mgmt-ext virtual-link-profile-id: mgmtnet vnfd-id: ns_relations_provides-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: requires-mgmt-ext virtual-link-profile-id: mgmtnet vnfd-id: ns_relations_requires-vnf id: ns_relations-ns name: ns_relations-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true vnfd-id: - ns_relations_provides-vnf - ns_relations_requires-vnf @@ -31,7 +31,7 @@ nsd: relation: - name: relation entities: - - id: '1' + - id: 1 endpoint: interface - - id: '2' + - id: 2 endpoint: interface diff --git a/charm-packages/pebble_charm_ns/pebble_nsd.yaml b/charm-packages/pebble_charm_ns/pebble_nsd.yaml index 87d53be0..31715f13 100644 --- a/charm-packages/pebble_charm_ns/pebble_nsd.yaml +++ b/charm-packages/pebble_charm_ns/pebble_nsd.yaml @@ -13,7 +13,7 @@ nsd: vnfd-id: pebble_charm-vnf id: pebble_charm-ns name: pebble_charm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/charm-packages/proxy_native_relation_ns/proxy_native_relation_nsd.yaml b/charm-packages/proxy_native_relation_ns/proxy_native_relation_nsd.yaml index 4039eb76..1933bae6 100644 --- a/charm-packages/proxy_native_relation_ns/proxy_native_relation_nsd.yaml +++ b/charm-packages/proxy_native_relation_ns/proxy_native_relation_nsd.yaml @@ -4,20 +4,20 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: provides-mgmt-ext - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: requires-mgmt-ext virtual-link-profile-id: mgmtnet vnfd-id: proxy_native_relation-vnf id: proxy_native_relation-ns name: proxy_native_relation-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true vnfd-id: - proxy_native_relation-vnf diff --git a/charm-packages/sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.yaml b/charm-packages/sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.yaml index d4382cd5..3fdcb24c 100644 --- a/charm-packages/sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.yaml +++ b/charm-packages/sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.yaml @@ -4,34 +4,34 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: sol004_k8s_proxy_charm-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: sol004_k8s_proxy_charm-vnf id: sol007_k8s_proxy_charm-ns name: sol007_k8s_proxy_charm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true - id: datanet vnfd-id: - sol004_k8s_proxy_charm-vnf diff --git a/charm-packages/vnf_relations_ns/vnf_relations_nsd.yaml b/charm-packages/vnf_relations_ns/vnf_relations_nsd.yaml index a4578c5b..ce549a7d 100644 --- a/charm-packages/vnf_relations_ns/vnf_relations_nsd.yaml +++ b/charm-packages/vnf_relations_ns/vnf_relations_nsd.yaml @@ -4,20 +4,20 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: provides-mgmt-ext - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: requires-mgmt-ext virtual-link-profile-id: mgmtnet vnfd-id: vnf_relations-vnf id: vnf_relations-ns name: vnf_relations-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true vnfd-id: - vnf_relations-vnf diff --git a/cirros_alarm_ns/cirros_alarm_nsd.yaml b/cirros_alarm_ns/cirros_alarm_nsd.yaml index 40030c29..c457683a 100644 --- a/cirros_alarm_ns/cirros_alarm_nsd.yaml +++ b/cirros_alarm_ns/cirros_alarm_nsd.yaml @@ -5,16 +5,16 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: eth0-ext virtual-link-profile-id: mgmtnet vnfd-id: cirros_alarm-vnf id: cirros_alarm-ns name: cirros_alarm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/cirros_alarm_vnf/cirros_alarm_vnfd.yaml b/cirros_alarm_vnf/cirros_alarm_vnfd.yaml index 41190230..718ee94b 100644 --- a/cirros_alarm_vnf/cirros_alarm_vnfd.yaml +++ b/cirros_alarm_vnf/cirros_alarm_vnfd.yaml @@ -69,7 +69,7 @@ vnfd: virtual-compute-desc: cirros_vnfd-VM-compute virtual-storage-desc: - cirros_vnfd-VM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: cirros_vnfd-VM-compute virtual-cpu: diff --git a/epa_1vm_passthrough_ns/epa_1vm_passthrough_nsd.yaml b/epa_1vm_passthrough_ns/epa_1vm_passthrough_nsd.yaml index 35bcd0c3..b5d9a0a3 100755 --- a/epa_1vm_passthrough_ns/epa_1vm_passthrough_nsd.yaml +++ b/epa_1vm_passthrough_ns/epa_1vm_passthrough_nsd.yaml @@ -5,31 +5,31 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: epa_1vm_passthrough-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: epa_1vm_passthrough-vnf id: epa_1vm_passthrough-ns name: epa_1vm_passthrough-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/epa_1vm_passthrough_vnf/epa_1vm_passthrough_vnfd.yaml b/epa_1vm_passthrough_vnf/epa_1vm_passthrough_vnfd.yaml index 8a2843e3..2bb6bc83 100755 --- a/epa_1vm_passthrough_vnf/epa_1vm_passthrough_vnfd.yaml +++ b/epa_1vm_passthrough_vnf/epa_1vm_passthrough_vnfd.yaml @@ -58,7 +58,7 @@ vnfd: virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: dataVM-compute virtual-cpu: diff --git a/epa_1vm_sriov_ns/epa_1vm_sriov_nsd.yaml b/epa_1vm_sriov_ns/epa_1vm_sriov_nsd.yaml index a0c66e51..a5fb5c1d 100644 --- a/epa_1vm_sriov_ns/epa_1vm_sriov_nsd.yaml +++ b/epa_1vm_sriov_ns/epa_1vm_sriov_nsd.yaml @@ -5,31 +5,31 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: epa_1vm_sriov-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: epa_1vm_sriov-vnf id: epa_1vm_sriov-ns name: epa_1vm_sriov-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/epa_1vm_sriov_vnf/epa_1vm_sriov_vnfd.yaml b/epa_1vm_sriov_vnf/epa_1vm_sriov_vnfd.yaml index 78b59432..e1c89eca 100644 --- a/epa_1vm_sriov_vnf/epa_1vm_sriov_vnfd.yaml +++ b/epa_1vm_sriov_vnf/epa_1vm_sriov_vnfd.yaml @@ -58,7 +58,7 @@ vnfd: virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: dataVM-compute virtual-cpu: diff --git a/epa_2vm_sriov_ns/epa_2vm_sriov_nsd.yaml b/epa_2vm_sriov_ns/epa_2vm_sriov_nsd.yaml index 57ae2397..8945ea35 100644 --- a/epa_2vm_sriov_ns/epa_2vm_sriov_nsd.yaml +++ b/epa_2vm_sriov_ns/epa_2vm_sriov_nsd.yaml @@ -5,31 +5,31 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: epa_2vm_sriov-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: epa_2vm_sriov-vnf id: epa_2vm_sriov-ns name: epa_2vm_sriov-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/epa_2vm_sriov_vnf/epa_2vm_sriov_vnfd.yaml b/epa_2vm_sriov_vnf/epa_2vm_sriov_vnfd.yaml index cdd4140b..915e1e05 100644 --- a/epa_2vm_sriov_vnf/epa_2vm_sriov_vnfd.yaml +++ b/epa_2vm_sriov_vnf/epa_2vm_sriov_vnfd.yaml @@ -76,7 +76,7 @@ vnfd: virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: mgmtVM-compute virtual-cpu: diff --git a/epa_quota_ns/epa_quota_nsd.yaml b/epa_quota_ns/epa_quota_nsd.yaml index c5d4a0cb..938cc7da 100644 --- a/epa_quota_ns/epa_quota_nsd.yaml +++ b/epa_quota_ns/epa_quota_nsd.yaml @@ -4,16 +4,16 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-cp0-ext virtual-link-profile-id: mgmtnet vnfd-id: epa_quota-vnf id: epa_quota-ns name: epa_quota-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/epa_quota_vnf/epa_quota_vnfd.yaml b/epa_quota_vnf/epa_quota_vnfd.yaml index 809d2ad9..5f328c81 100644 --- a/epa_quota_vnf/epa_quota_vnfd.yaml +++ b/epa_quota_vnf/epa_quota_vnfd.yaml @@ -46,7 +46,7 @@ vnfd: virtual-compute-desc: epa_quota-VM-compute virtual-storage-desc: - epa_quota-VM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: epa_quota-VM-compute virtual-cpu: diff --git a/hackfest_basic_metrics_ns/hackfest_basic_nsd.yaml b/hackfest_basic_metrics_ns/hackfest_basic_metrics_nsd.yaml similarity index 86% rename from hackfest_basic_metrics_ns/hackfest_basic_nsd.yaml rename to hackfest_basic_metrics_ns/hackfest_basic_metrics_nsd.yaml index a9f95c74..f1f759db 100644 --- a/hackfest_basic_metrics_ns/hackfest_basic_nsd.yaml +++ b/hackfest_basic_metrics_ns/hackfest_basic_metrics_nsd.yaml @@ -4,16 +4,16 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-cp0-ext virtual-link-profile-id: mgmtnet vnfd-id: hackfest_basic_metrics-vnf id: hackfest_basic-ns-metrics name: hackfest_basic-ns-metrics - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml b/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml index e83eb3dd..4153a171 100644 --- a/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml +++ b/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml @@ -5,7 +5,7 @@ vnfd: instantiation-level: - id: default-instantiation-level vdu-level: - - number-of-instances: "1" + - number-of-instances: 1 vdu-id: hackfest_basic_metrics-VM scaling-aspect: - aspect-delta-details: @@ -13,7 +13,7 @@ vnfd: - id: vdu_autoscale-delta vdu-delta: - id: hackfest_basic_metrics-VM - number-of-instances: "1" + number-of-instances: 1 id: vdu_autoscale max-scale-level: 1 name: vdu_autoscale @@ -31,8 +31,8 @@ vnfd: threshold-time: 10 vdu-profile: - id: hackfest_basic_metrics-VM - max-number-of-instances: "2" - min-number-of-instances: "1" + max-number-of-instances: 2 + min-number-of-instances: 1 ext-cpd: - id: vnf-cp0-ext int-cpd: @@ -88,7 +88,7 @@ vnfd: virtual-compute-desc: hackfest_basic_metrics-VM-compute virtual-storage-desc: - hackfest_basic_metrics-VM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: hackfest_basic_metrics-VM-compute virtual-cpu: diff --git a/hackfest_basic_ns/hackfest_basic_nsd.yaml b/hackfest_basic_ns/hackfest_basic_nsd.yaml index be76b264..b7510370 100644 --- a/hackfest_basic_ns/hackfest_basic_nsd.yaml +++ b/hackfest_basic_ns/hackfest_basic_nsd.yaml @@ -4,16 +4,16 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-cp0-ext virtual-link-profile-id: mgmtnet vnfd-id: hackfest_basic-vnf id: hackfest_basic-ns name: hackfest_basic-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/hackfest_basic_sriov_ns/hackfest_basic_sriov_nsd.yaml b/hackfest_basic_sriov_ns/hackfest_basic_sriov_nsd.yaml index 7f7397b0..9b363316 100644 --- a/hackfest_basic_sriov_ns/hackfest_basic_sriov_nsd.yaml +++ b/hackfest_basic_sriov_ns/hackfest_basic_sriov_nsd.yaml @@ -4,20 +4,20 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-cp0-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-cp1-ext virtual-link-profile-id: sriov_vld vnfd-id: hackfest_basic_sriov-vnf id: hackfest_basic_sriov-ns name: hackfest_basic_sriov-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml b/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml index d8874bf5..e7310c30 100644 --- a/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml +++ b/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml @@ -51,7 +51,7 @@ vnfd: virtual-compute-desc: hackfest_basic-VM-compute virtual-storage-desc: - hackfest_basic-VM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: hackfest_basic-VM-compute virtual-cpu: diff --git a/hackfest_basic_vnf/hackfest_basic_vnfd.yaml b/hackfest_basic_vnf/hackfest_basic_vnfd.yaml index 4625e424..25676ef8 100644 --- a/hackfest_basic_vnf/hackfest_basic_vnfd.yaml +++ b/hackfest_basic_vnf/hackfest_basic_vnfd.yaml @@ -51,13 +51,13 @@ vnfd: - name: vdu-eth0 virtual-interface: type: PARAVIRT - version: '1.0' + version: 1.0 virtual-compute-desc: - id: hackfest_basic-VM-compute virtual-cpu: - num-virtual-cpu: "1" + num-virtual-cpu: 1 virtual-memory: - size: "1.0" + size: 1.0 virtual-storage-desc: - id: hackfest_basic-VM-storage - size-of-storage: "10" + size-of-storage: 10 diff --git a/hackfest_cloudinit_ns/hackfest_cloudinit_nsd.yaml b/hackfest_cloudinit_ns/hackfest_cloudinit_nsd.yaml index bd8283cd..263cd6fe 100644 --- a/hackfest_cloudinit_ns/hackfest_cloudinit_nsd.yaml +++ b/hackfest_cloudinit_ns/hackfest_cloudinit_nsd.yaml @@ -4,31 +4,31 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: hackfest_cloudinit-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: hackfest_cloudinit-vnf id: hackfest_cloudinit-ns name: hackfest_cloudinit-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml b/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml index 49f6d299..8f9b1dcc 100644 --- a/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml +++ b/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml @@ -95,20 +95,20 @@ vnfd: virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: mgmtVM-compute virtual-cpu: - num-virtual-cpu: "1" + num-virtual-cpu: 1 virtual-memory: - size: "1.0" + size: 1.0 - id: dataVM-compute virtual-cpu: - num-virtual-cpu: "1" + num-virtual-cpu: 1 virtual-memory: - size: "1.0" + size: 1.0 virtual-storage-desc: - id: mgmtVM-storage - size-of-storage: "10" + size-of-storage: 10 - id: dataVM-storage - size-of-storage: "10" + size-of-storage: 10 diff --git a/hackfest_epasriov_ns/hackfest_epasriov_nsd.yaml b/hackfest_epasriov_ns/hackfest_epasriov_nsd.yaml index 74a896aa..6756c27e 100644 --- a/hackfest_epasriov_ns/hackfest_epasriov_nsd.yaml +++ b/hackfest_epasriov_ns/hackfest_epasriov_nsd.yaml @@ -5,31 +5,31 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: hackfest_epasriov-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: hackfest_epasriov-vnf id: hackfest_epasriov-ns name: hackfest_epasriov-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/hackfest_epasriov_vnf/hackfest_epasriov_vnfd.yaml b/hackfest_epasriov_vnf/hackfest_epasriov_vnfd.yaml index 87bc4aa1..c1cc81b8 100644 --- a/hackfest_epasriov_vnf/hackfest_epasriov_vnfd.yaml +++ b/hackfest_epasriov_vnf/hackfest_epasriov_vnfd.yaml @@ -78,7 +78,7 @@ vnfd: virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: mgmtVM-compute virtual-cpu: diff --git a/hackfest_firewall_pnf/hackfest_firewall_pnfd.yaml b/hackfest_firewall_pnf/hackfest_firewall_pnfd.yaml index b39a5ecb..0b32433f 100644 --- a/hackfest_firewall_pnf/hackfest_firewall_pnfd.yaml +++ b/hackfest_firewall_pnf/hackfest_firewall_pnfd.yaml @@ -86,4 +86,4 @@ vnfd: virtual-network-interface-requirement: - name: vnf_internal name: vyos-VM - version: '1.0' \ No newline at end of file + version: 1.0 \ No newline at end of file diff --git a/hackfest_firewall_pnf_ns/hackfest_firewall_pnf_nsd.yaml b/hackfest_firewall_pnf_ns/hackfest_firewall_pnf_nsd.yaml index a8f8e924..09c30495 100644 --- a/hackfest_firewall_pnf_ns/hackfest_firewall_pnf_nsd.yaml +++ b/hackfest_firewall_pnf_ns/hackfest_firewall_pnf_nsd.yaml @@ -33,7 +33,7 @@ nsd: vnfd-id: hackfest_firewall_pnf id: hackfest_firewall_pnf_ns name: hackfest_firewall_pnf_ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmt mgmt-network: true diff --git a/hackfest_k8sproxycharm_ns/hackfest_k8sproxycharm_nsd.yaml b/hackfest_k8sproxycharm_ns/hackfest_k8sproxycharm_nsd.yaml index 7cb449be..28b9fbae 100644 --- a/hackfest_k8sproxycharm_ns/hackfest_k8sproxycharm_nsd.yaml +++ b/hackfest_k8sproxycharm_ns/hackfest_k8sproxycharm_nsd.yaml @@ -4,31 +4,31 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: hackfest_k8sproxycharm-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: hackfest_k8sproxycharm-vnf id: hackfest_k8sproxycharm-ns name: hackfest_k8sproxycharm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml b/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml index cdf10329..6ed2d81a 100644 --- a/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml +++ b/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml @@ -38,14 +38,14 @@ vnfd: value: ubuntu - name: ssh-password value: osm4u - seq: '1' + seq: 1 - name: touch execution-environment-ref: simple-k8s-ee parameter: - data-type: STRING name: filename value: /home/ubuntu/first-touch - seq: '2' + seq: 2 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -83,7 +83,7 @@ vnfd: virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: mgmtVM-compute virtual-cpu: diff --git a/hackfest_multivdu_ns/hackfest_multivdu_nsd.yaml b/hackfest_multivdu_ns/hackfest_multivdu_nsd.yaml index dcf32908..a0eb5b11 100644 --- a/hackfest_multivdu_ns/hackfest_multivdu_nsd.yaml +++ b/hackfest_multivdu_ns/hackfest_multivdu_nsd.yaml @@ -4,31 +4,31 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: hackfest_multivdu-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: hackfest_multivdu-vnf id: hackfest_multivdu-ns name: hackfest_multivdu-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml index 6637cf59..cdb6bcb6 100644 --- a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml +++ b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml @@ -93,7 +93,7 @@ vnfd: virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: mgmtVM-compute virtual-memory: diff --git a/hackfest_proxycharm_ns/hackfest_simplecharm_nsd.yaml b/hackfest_proxycharm_ns/hackfest_simplecharm_nsd.yaml index f6dcb6ba..615576c6 100644 --- a/hackfest_proxycharm_ns/hackfest_simplecharm_nsd.yaml +++ b/hackfest_proxycharm_ns/hackfest_simplecharm_nsd.yaml @@ -4,31 +4,31 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf1 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: hackfest_proxycharm-vnf - - id: '2' + - id: vnf2 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '2' + - constituent-base-element-id: vnf2 constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: hackfest_proxycharm-vnf id: hackfest_proxycharm-ns name: hackfest_proxycharm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml b/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml index ae421383..b724abb6 100644 --- a/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml +++ b/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml @@ -85,7 +85,7 @@ vnfd: virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: mgmtVM-compute virtual-cpu: diff --git a/hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml b/hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml index e8a889eb..358518c0 100644 --- a/hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml +++ b/hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml @@ -4,16 +4,16 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: mgmt-ext virtual-link-profile-id: mgmtnet vnfd-id: hackfest-simple-k8s-vnf id: hackfest-simple-k8s-ns name: hackfest-simple-k8s-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/hackfest_virtual-pc_ns/hackfest_virtual-pc_nsd.yaml b/hackfest_virtual-pc_ns/hackfest_virtual-pc_nsd.yaml index fb8c4ea3..5209ed08 100644 --- a/hackfest_virtual-pc_ns/hackfest_virtual-pc_nsd.yaml +++ b/hackfest_virtual-pc_ns/hackfest_virtual-pc_nsd.yaml @@ -20,23 +20,23 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: virtual-pc-private-ext virtual-link-profile-id: private - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: virtual-pc-mgmt-ext virtual-link-profile-id: mgmtnet vnfd-id: hackfest_virtual-pc_vnf id: hackfest_virtual-pc_ns name: hackfest_virtual-pc_ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true - id: private vnfd-id: - hackfest_virtual-pc_vnf diff --git a/hackfest_virtual-pc_vnfd/virtual-pc_vnfd.yaml b/hackfest_virtual-pc_vnfd/virtual-pc_vnfd.yaml index dff3c9d8..938bc44c 100644 --- a/hackfest_virtual-pc_vnfd/virtual-pc_vnfd.yaml +++ b/hackfest_virtual-pc_vnfd/virtual-pc_vnfd.yaml @@ -106,7 +106,7 @@ vnfd: virtual-compute-desc: virtual-pc-vdu-compute virtual-storage-desc: - virtual-pc-vdu-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: virtual-pc-vdu-compute virtual-cpu: diff --git a/hackfest_vyos_ns/hackfest_vyos_nsd.yaml b/hackfest_vyos_ns/hackfest_vyos_nsd.yaml index a44d0186..f7379b26 100644 --- a/hackfest_vyos_ns/hackfest_vyos_nsd.yaml +++ b/hackfest_vyos_ns/hackfest_vyos_nsd.yaml @@ -4,25 +4,25 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-mgmt-ext ip-address: 172.21.250.200 virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-internal-ext virtual-link-profile-id: internal - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-external-ext virtual-link-profile-id: external vnfd-id: hackfest_vyos-vnf id: hackfest_vyos-ns name: hackfest_vyos-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/hackfest_vyos_vnf/hackfest_vyos_vnfd.yaml b/hackfest_vyos_vnf/hackfest_vyos_vnfd.yaml index acbf2474..fade33ee 100644 --- a/hackfest_vyos_vnf/hackfest_vyos_vnfd.yaml +++ b/hackfest_vyos_vnf/hackfest_vyos_vnfd.yaml @@ -60,7 +60,7 @@ vnfd: virtual-compute-desc: vyos-VM-compute virtual-storage-desc: - vyos-VM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: vyos-VM-compute virtual-cpu: diff --git a/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml b/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml index 2195f42d..622910db 100644 --- a/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml +++ b/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml @@ -4,16 +4,16 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet vnfd-id: ipprofile_2vm-vnf id: ipprofile_2vm-ns name: ipprofile_2vm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml b/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml index 494235a2..f7697b3a 100644 --- a/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml +++ b/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml @@ -16,7 +16,7 @@ vnfd: min-number-of-instances: 1 virtual-link-profile: - id: internal - flavour: '' + flavour: virtual-link-protocol-data: l3-protocol-data: cidr: 192.168.200.0/24 @@ -84,7 +84,7 @@ vnfd: virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: mgmtVM-compute virtual-memory: diff --git a/k8s_juju_ns/k8s_juju_nsd.yaml b/k8s_juju_ns/k8s_juju_nsd.yaml index 2d83c3f9..0e6abdd4 100644 --- a/k8s_juju_ns/k8s_juju_nsd.yaml +++ b/k8s_juju_ns/k8s_juju_nsd.yaml @@ -43,10 +43,10 @@ nsd: vnfd-id: k8s_jujucontroller_vnf id: k8s_juju name: k8s_juju - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true vnfd-id: - k8s_jujumachine_vnf - k8s_jujucontroller_vnf diff --git a/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml b/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml index aa366211..9479055e 100644 --- a/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml +++ b/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml @@ -137,10 +137,10 @@ vnfd: value: - name: ssh-username value: ubuntu - seq: '1' + seq: 1 - name: setup-juju execution-environment-ref: tid-jujuk8s-ee - seq: '2' + seq: 2 - name: add-machines execution-environment-ref: tid-jujuk8s-ee parameter: @@ -164,19 +164,19 @@ vnfd: value: - name: machine10 value: - seq: '3' + seq: 3 - name: deploy-bundle execution-environment-ref: tid-jujuk8s-ee parameter: - name: bundle value: - seq: '4' + seq: 4 - name: post-deploy execution-environment-ref: tid-jujuk8s-ee - seq: '5' + seq: 5 - name: install-openebs-kubectl execution-environment-ref: tid-jujuk8s-ee - seq: '6' + seq: 6 ext-cpd: - id: mgmt-ext int-cpd: diff --git a/magma/fb_magma_knf/fb_magma_vnfd.yaml b/magma/fb_magma_knf/fb_magma_vnfd.yaml index 068ed749..43de81b9 100644 --- a/magma/fb_magma_knf/fb_magma_vnfd.yaml +++ b/magma/fb_magma_knf/fb_magma_vnfd.yaml @@ -15,4 +15,4 @@ vnfd: mgmt-cp: mgmt-ext product-name: fb_magma_knf provider: ATOS - version: '1.0' + version: 1.0 diff --git a/magma/fb_magma_ns/fb_magma_nsd.yaml b/magma/fb_magma_ns/fb_magma_nsd.yaml index 3cd817fc..d6856e96 100644 --- a/magma/fb_magma_ns/fb_magma_nsd.yaml +++ b/magma/fb_magma_ns/fb_magma_nsd.yaml @@ -14,7 +14,7 @@ nsd: vnfd-id: fb_magma_knf id: fb_magma_ns name: fb_magma_ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml b/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml index f2cf5089..2bd0e24e 100644 --- a/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml +++ b/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml @@ -56,4 +56,4 @@ vnfd: virtual-network-interface-requirement: - name: eth0 pdu-type: gateway - version: '1.0' + version: 1.0 diff --git a/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml b/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml index 43717cfe..a7889102 100644 --- a/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml +++ b/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml @@ -31,7 +31,7 @@ nsd: vnfd-id: hackfest_gateway_vnfd id: hackfest_magma-agw-enb_nsd name: hackfest_magma-agw-enb_nsd - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmt mgmt-network: true 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 8c955dae..347d27d5 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 @@ -267,7 +267,7 @@ vnfd: virtual-compute-desc: srsLTE-vdu-compute virtual-storage-desc: - srsLTE-vdu-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: magma-agw-vdu-compute virtual-cpu: diff --git a/magma/squid_cnf/squid_vnfd.yaml b/magma/squid_cnf/squid_vnfd.yaml index 424020af..f177900f 100644 --- a/magma/squid_cnf/squid_vnfd.yaml +++ b/magma/squid_cnf/squid_vnfd.yaml @@ -36,4 +36,4 @@ vnfd: mgmt-cp: mgmtnet-ext product-name: squid_cnf provider: Canonical - version: '1.0' + version: 1.0 diff --git a/magma/squid_cnf_ns/squid_cnf_nsd.yaml b/magma/squid_cnf_ns/squid_cnf_nsd.yaml index 871a35fe..886f80bf 100644 --- a/magma/squid_cnf_ns/squid_cnf_nsd.yaml +++ b/magma/squid_cnf_ns/squid_cnf_nsd.yaml @@ -14,7 +14,7 @@ nsd: vnfd-id: squid_cnf id: squid_cnf_ns name: squid_cnf_ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/nscharm_ns/nscharm_nsd.yaml b/nscharm_ns/nscharm_nsd.yaml index 5aaaeeca..699c48ea 100644 --- a/nscharm_ns/nscharm_nsd.yaml +++ b/nscharm_ns/nscharm_nsd.yaml @@ -20,10 +20,10 @@ nsd: vnfd-id: nscharm-policy-vnf id: nscharm-ns name: nscharm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true vim-network-name: osm-ext vnfd-id: - nscharm-user-vnf @@ -32,15 +32,15 @@ nsd: juju: charm: ns initial-config-primitive: - - seq: '1' + - seq: 1 name: config parameter: # Configure Juju credentials - name: juju-username - value: 'admin' + value: admin - name: juju-password - value: 'a5611fc6452349cc6e45705d34c501d4' - - seq: '2' + value: a5611fc6452349cc6e45705d34c501d4 + - seq: 2 name: add-user parameter: - name: username diff --git a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml index 65f6aa91..8df7c479 100644 --- a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml +++ b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml @@ -29,7 +29,7 @@ vnfd: value: ubuntu - name: ssh-password value: osm4u - seq: '1' + seq: 1 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -82,7 +82,7 @@ vnfd: virtual-compute-desc: policyVM-compute virtual-storage-desc: - policyVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: policyVM-compute virtual-cpu: diff --git a/nscharm_user_vnf/nscharm_user_vnfd.yaml b/nscharm_user_vnf/nscharm_user_vnfd.yaml index 1abef506..86635cf5 100644 --- a/nscharm_user_vnf/nscharm_user_vnfd.yaml +++ b/nscharm_user_vnf/nscharm_user_vnfd.yaml @@ -29,7 +29,7 @@ vnfd: value: ubuntu - name: ssh-password value: osm4u - seq: '1' + seq: 1 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -82,7 +82,7 @@ vnfd: virtual-compute-desc: userVM-compute virtual-storage-desc: - userVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: userVM-compute virtual-cpu: diff --git a/openldap_knf/openldap_vnfd.yaml b/openldap_knf/openldap_vnfd.yaml index 152efa66..ce8b112f 100644 --- a/openldap_knf/openldap_vnfd.yaml +++ b/openldap_knf/openldap_vnfd.yaml @@ -15,4 +15,4 @@ vnfd: mgmt-cp: mgmt-ext product-name: openldap_knf provider: Telefonica - version: '1.0' + version: 1.0 diff --git a/openldap_ns/openldap_nsd.yaml b/openldap_ns/openldap_nsd.yaml index b995164c..980fd2e8 100644 --- a/openldap_ns/openldap_nsd.yaml +++ b/openldap_ns/openldap_nsd.yaml @@ -14,9 +14,9 @@ nsd: vnfd-id: openldap_knf id: openldap_ns name: openldap_ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true vnfd-id: - openldap_knf diff --git a/openldap_scale_knf/openldap_scale_vnfd.yaml b/openldap_scale_knf/openldap_scale_vnfd.yaml index bc892a20..54729a29 100644 --- a/openldap_scale_knf/openldap_scale_vnfd.yaml +++ b/openldap_scale_knf/openldap_scale_vnfd.yaml @@ -33,4 +33,4 @@ vnfd: helm-chart: stable/openldap mgmt-cp: mgmt-ext product-name: openldap_scale_knf - version: '1.0' + version: 1.0 diff --git a/openldap_scale_ns/openldap_scale_nsd.yaml b/openldap_scale_ns/openldap_scale_nsd.yaml index 783ca9ff..65aa17c7 100644 --- a/openldap_scale_ns/openldap_scale_nsd.yaml +++ b/openldap_scale_ns/openldap_scale_nsd.yaml @@ -13,9 +13,9 @@ nsd: vnfd-id: openldap_scale_knf id: openldap_scale_ns name: openldap_scale_ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet - mgmt-network: 'true' + mgmt-network: true vnfd-id: - openldap_scale_knf diff --git a/sample_ee_ns/sample_ee_nsd.yaml b/sample_ee_ns/sample_ee_nsd.yaml index 0f6d44b5..00dcda85 100644 --- a/sample_ee_ns/sample_ee_nsd.yaml +++ b/sample_ee_ns/sample_ee_nsd.yaml @@ -17,7 +17,7 @@ nsd: vnfd-id: sample_ee-vnf id: sample_ee-ns name: sample_ee-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/sample_ee_vnf/sample_ee_vnfd.yaml b/sample_ee_vnf/sample_ee_vnfd.yaml index d528a5c6..dad64aae 100644 --- a/sample_ee_vnf/sample_ee_vnfd.yaml +++ b/sample_ee_vnf/sample_ee_vnfd.yaml @@ -147,7 +147,7 @@ vnfd: virtual-compute-desc: sample_ee-VM-compute virtual-storage-desc: - sample_ee-VM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: sample_ee-VM-compute virtual-cpu: diff --git a/several_volumes_ns/several_volumes_nsd.yaml b/several_volumes_ns/several_volumes_nsd.yaml index 30726a29..e9bea9f2 100755 --- a/several_volumes_ns/several_volumes_nsd.yaml +++ b/several_volumes_ns/several_volumes_nsd.yaml @@ -13,7 +13,7 @@ nsd: vnfd-id: several_volumes-vnf id: several_volumes-ns name: several_volumes-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/several_volumes_vnf/several_volumes_vnfd.yaml b/several_volumes_vnf/several_volumes_vnfd.yaml index f4305ec4..6f6e0d1a 100644 --- a/several_volumes_vnf/several_volumes_vnfd.yaml +++ b/several_volumes_vnf/several_volumes_vnfd.yaml @@ -48,21 +48,21 @@ vnfd: - name: vdu-eth0 virtual-interface: type: PARAVIRT - version: '1.0' + version: 1.0 virtual-compute-desc: - id: several_volumes-VM-compute virtual-cpu: - num-virtual-cpu: "1" + num-virtual-cpu: 1 virtual-memory: - size: "1.0" + size: 1.0 virtual-storage-desc: - id: root-volume #type-of-storage: root-storage - size-of-storage: "10" + size-of-storage: 10 - id: persistent-volume type-of-storage: persistent-storage - size-of-storage: "1" + size-of-storage: 1 - id: ephemeral-volume type-of-storage: ephemeral-storage - size-of-storage: "2" + size-of-storage: 2 diff --git a/simple_2vm_ns/simple_2vm_nsd.yaml b/simple_2vm_ns/simple_2vm_nsd.yaml index 27194655..bf61ade1 100755 --- a/simple_2vm_ns/simple_2vm_nsd.yaml +++ b/simple_2vm_ns/simple_2vm_nsd.yaml @@ -4,16 +4,16 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet vnfd-id: simple_2vm-vnf id: simple_2vm-ns name: simple_2vm-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/simple_2vm_vnf/simple_2vm_vnfd.yaml b/simple_2vm_vnf/simple_2vm_vnfd.yaml index 562af4d2..ddd978ff 100755 --- a/simple_2vm_vnf/simple_2vm_vnfd.yaml +++ b/simple_2vm_vnf/simple_2vm_vnfd.yaml @@ -77,7 +77,7 @@ vnfd: virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: mgmtVM-compute virtual-memory: diff --git a/simple_ee_vnf/simple_ee_vnfd.yaml b/simple_ee_vnf/simple_ee_vnfd.yaml index eb478520..d3723a94 100644 --- a/simple_ee_vnf/simple_ee_vnfd.yaml +++ b/simple_ee_vnf/simple_ee_vnfd.yaml @@ -43,13 +43,13 @@ vnfd: value: ubuntu - name: ssh-password value: osm2020 - seq: '1' + seq: 1 - execution-environment-ref: monitor name: touch parameter: - name: file-path value: /home/ubuntu/first-touch - seq: '2' + seq: 2 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -77,7 +77,7 @@ vnfd: virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: mgmtVM-compute virtual-cpu: @@ -91,8 +91,8 @@ vnfd: numa-node-policy: mem-policy: STRICT node: - - id: '1' - node-cnt: '1' + - id: 1 + node-cnt: 1 size: 1.0 virtual-storage-desc: - id: mgmtVM-storage diff --git a/simple_nopasswd_ns/simple_nopasswd_nsd.yaml b/simple_nopasswd_ns/simple_nopasswd_nsd.yaml index 3190ed04..ed8389da 100644 --- a/simple_nopasswd_ns/simple_nopasswd_nsd.yaml +++ b/simple_nopasswd_ns/simple_nopasswd_nsd.yaml @@ -5,20 +5,20 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-mgmt-ext virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-data-ext virtual-link-profile-id: datanet vnfd-id: simple_nopasswd-vnf id: simple_nopasswd-ns name: simple_nopasswd-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml index a87c2c19..7e0bb097 100644 --- a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml +++ b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml @@ -42,13 +42,13 @@ vnfd: value: - name: ssh-username value: ubuntu - seq: '1' + seq: 1 - name: touch execution-environment-ref: simple-ee parameter: - name: filename value: /home/ubuntu/first-touch - seq: '2' + seq: 2 ext-cpd: - id: vnf-mgmt-ext int-cpd: @@ -109,7 +109,7 @@ vnfd: virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: mgmtVM-compute virtual-cpu: diff --git a/slice_basic_middle_ns/slice_basic_middle_nsd.yaml b/slice_basic_middle_ns/slice_basic_middle_nsd.yaml index 2da176c6..fd35f0bb 100644 --- a/slice_basic_middle_ns/slice_basic_middle_nsd.yaml +++ b/slice_basic_middle_ns/slice_basic_middle_nsd.yaml @@ -4,7 +4,7 @@ nsd: name: slice_basic_middle_ns description: NSD to be used on Slice Testing designer: OSM - version: '1.0' + version: 1.0 vnfd-id: - slice_basic_middle_vnf diff --git a/slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml b/slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml index ec9b66d5..ddaea550 100644 --- a/slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml +++ b/slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml @@ -78,7 +78,7 @@ vnfd: virtual-compute-desc: ubuntu_slice-VM-compute virtual-storage-desc: - ubuntu_slice-VM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: ubuntu_slice-VM-compute virtual-cpu: diff --git a/slice_basic_ns/slice_basic_nsd.yaml b/slice_basic_ns/slice_basic_nsd.yaml index bb84cc1e..7af1cfbd 100644 --- a/slice_basic_ns/slice_basic_nsd.yaml +++ b/slice_basic_ns/slice_basic_nsd.yaml @@ -4,7 +4,7 @@ nsd: name: slice_basic_ns description: NSD to be used on Slice Testing designer: OSM - version: '1.0' + version: 1.0 vnfd-id: - slice_basic_vnf diff --git a/slice_basic_vnf/slice_basic_vnfd.yaml b/slice_basic_vnf/slice_basic_vnfd.yaml index a7eabf0d..d4a74eb3 100644 --- a/slice_basic_vnf/slice_basic_vnfd.yaml +++ b/slice_basic_vnf/slice_basic_vnfd.yaml @@ -67,7 +67,7 @@ vnfd: virtual-compute-desc: ubuntu_slice-VM-compute virtual-storage-desc: - ubuntu_slice-VM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: ubuntu_slice-VM-compute virtual-cpu: diff --git a/snmp_ee_ns/snmp_ee_nsd.yaml b/snmp_ee_ns/snmp_ee_nsd.yaml index ae6de4d5..3a6037e9 100644 --- a/snmp_ee_ns/snmp_ee_nsd.yaml +++ b/snmp_ee_ns/snmp_ee_nsd.yaml @@ -21,7 +21,7 @@ nsd: vnfd-id: snmp_ee-vnf id: snmp_ee-ns name: snmp_ee-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/snmp_ee_vnf/snmp_ee_vnfd.yaml b/snmp_ee_vnf/snmp_ee_vnfd.yaml index 478e0322..c785c858 100644 --- a/snmp_ee_vnf/snmp_ee_vnfd.yaml +++ b/snmp_ee_vnf/snmp_ee_vnfd.yaml @@ -85,7 +85,7 @@ vnfd: virtual-compute-desc: vyos-VM-compute virtual-storage-desc: - vyos-VM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: vyos-VM-compute virtual-cpu: diff --git a/snmp_setcomm_ee_ns/snmp_setcomm_ee_nsd.yaml b/snmp_setcomm_ee_ns/snmp_setcomm_ee_nsd.yaml index 8576e17f..1b78cc2e 100644 --- a/snmp_setcomm_ee_ns/snmp_setcomm_ee_nsd.yaml +++ b/snmp_setcomm_ee_ns/snmp_setcomm_ee_nsd.yaml @@ -21,7 +21,7 @@ nsd: vnfd-id: snmp_setcomm_ee-vnf id: snmp_setcomm_ee-ns name: snmp_setcomm_ee-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/snmp_setcomm_ee_vnf/snmp_setcomm_ee_vnfd.yaml b/snmp_setcomm_ee_vnf/snmp_setcomm_ee_vnfd.yaml index 8eceee81..b383a66a 100644 --- a/snmp_setcomm_ee_vnf/snmp_setcomm_ee_vnfd.yaml +++ b/snmp_setcomm_ee_vnf/snmp_setcomm_ee_vnfd.yaml @@ -100,7 +100,7 @@ vnfd: virtual-compute-desc: vyos-VM-compute virtual-storage-desc: - vyos-VM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: vyos-VM-compute virtual-cpu: diff --git a/sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.yaml b/sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.yaml index 2d2abd03..eb78eeee 100644 --- a/sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.yaml +++ b/sol004_hackfest_basic_vnf/sol004_hackfest_basic_vnfd.yaml @@ -51,13 +51,13 @@ vnfd: - name: vdu-eth0 virtual-interface: type: PARAVIRT - version: '1.0' + version: 1.0 virtual-compute-desc: - id: sol004_hackfest_basic-VM-compute virtual-cpu: - num-virtual-cpu: "1" + num-virtual-cpu: 1 virtual-memory: - size: "1.0" + size: 1.0 virtual-storage-desc: - id: sol004_hackfest_basic-VM-storage - size-of-storage: "10" + size-of-storage: 10 diff --git a/sol007_hackfest_basic_ns/sol007_hackfest_basic_nsd.yaml b/sol007_hackfest_basic_ns/sol007_hackfest_basic_nsd.yaml index 5d925932..ae609b87 100644 --- a/sol007_hackfest_basic_ns/sol007_hackfest_basic_nsd.yaml +++ b/sol007_hackfest_basic_ns/sol007_hackfest_basic_nsd.yaml @@ -4,16 +4,16 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-cp0-ext virtual-link-profile-id: mgmtnet vnfd-id: sol004_hackfest_basic-vnf id: sol007_hackfest_basic-ns name: sol007_hackfest_basic-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/squid_metrics_cnf_ns/squid_cnf_nsd.yaml b/squid_metrics_cnf_ns/squid_cnf_nsd.yaml index 871a35fe..886f80bf 100644 --- a/squid_metrics_cnf_ns/squid_cnf_nsd.yaml +++ b/squid_metrics_cnf_ns/squid_cnf_nsd.yaml @@ -14,7 +14,7 @@ nsd: vnfd-id: squid_cnf id: squid_cnf_ns name: squid_cnf_ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/ubuntu_4ifaces_ns/ubuntu_4ifaces_nsd.yaml b/ubuntu_4ifaces_ns/ubuntu_4ifaces_nsd.yaml index 1078aa8b..d22386c6 100644 --- a/ubuntu_4ifaces_ns/ubuntu_4ifaces_nsd.yaml +++ b/ubuntu_4ifaces_ns/ubuntu_4ifaces_nsd.yaml @@ -66,7 +66,7 @@ nsd: virtual-link-profile-id: datanet3 id: ubuntu_4ifaces-ns name: ubuntu_4ifaces-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml b/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml index 2cb11410..a31e6543 100644 --- a/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml +++ b/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml @@ -78,7 +78,7 @@ vnfd: virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: dataVM-compute virtual-cpu: diff --git a/ubuntu_cloudinit_ns/ubuntu_cloudinit_nsd.yaml b/ubuntu_cloudinit_ns/ubuntu_cloudinit_nsd.yaml index ea9b4239..07a70b1d 100644 --- a/ubuntu_cloudinit_ns/ubuntu_cloudinit_nsd.yaml +++ b/ubuntu_cloudinit_ns/ubuntu_cloudinit_nsd.yaml @@ -5,16 +5,16 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: vnf-cp0-ext virtual-link-profile-id: mgmtnet vnfd-id: ubuntu_cloudinit-vnf id: ubuntu_cloudinit-ns name: ubuntu_cloudinit-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml index 45b94806..3d600ccd 100644 --- a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml +++ b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml @@ -54,7 +54,7 @@ vnfd: virtual-compute-desc: ubuntu_cloudinit-vnf-VM-compute virtual-storage-desc: - ubuntu_cloudinit-vnf-VM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: ubuntu_cloudinit-vnf-VM-compute virtual-cpu: diff --git a/vdu_replicas_ns/vdu_replicas_nsd.yaml b/vdu_replicas_ns/vdu_replicas_nsd.yaml index a3f2599c..847c3fb6 100644 --- a/vdu_replicas_ns/vdu_replicas_nsd.yaml +++ b/vdu_replicas_ns/vdu_replicas_nsd.yaml @@ -28,7 +28,7 @@ nsd: vnfd-id: vdu-replicas-vnf id: vdu-replicas-ns name: vdu-replicas-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true diff --git a/vdu_replicas_vnf/vdu_replicas_vnfd.yaml b/vdu_replicas_vnf/vdu_replicas_vnfd.yaml index 8c7fbc1e..58f6b22c 100644 --- a/vdu_replicas_vnf/vdu_replicas_vnfd.yaml +++ b/vdu_replicas_vnf/vdu_replicas_vnfd.yaml @@ -26,7 +26,7 @@ vnfd: max-number-of-instances: 10 min-number-of-instances: 2 virtual-link-profile: - - flavour: '' + - flavour: id: interdata virtual-link-protocol-data: l3-protocol-data: @@ -111,7 +111,7 @@ vnfd: virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: mgmtVM-compute virtual-cpu: diff --git a/wiki_webserver_autoscale_nsd/wiki_webserver_autoscale_nsd.yaml b/wiki_webserver_autoscale_nsd/wiki_webserver_autoscale_nsd.yaml index f3fa3dd4..59d0ccca 100644 --- a/wiki_webserver_autoscale_nsd/wiki_webserver_autoscale_nsd.yaml +++ b/wiki_webserver_autoscale_nsd/wiki_webserver_autoscale_nsd.yaml @@ -5,19 +5,19 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: vnf virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: vnf constituent-cpd-id: haproxy_public-ext virtual-link-profile-id: public_vld vnfd-id: wiki_webserver_autoscale_vnf id: wiki_webserver_autoscale_ns name: wiki_webserver_autoscale_ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: public_vld - mgmt-network: 'true' + mgmt-network: true vim-network-name: osm-ext vnfd-id: - wiki_webserver_autoscale_vnf diff --git a/wiki_webserver_autoscale_vnfd/wiki_webserver_autoscale_vnfd.yaml b/wiki_webserver_autoscale_vnfd/wiki_webserver_autoscale_vnfd.yaml index 3154afe8..4b46c5ba 100644 --- a/wiki_webserver_autoscale_vnfd/wiki_webserver_autoscale_vnfd.yaml +++ b/wiki_webserver_autoscale_vnfd/wiki_webserver_autoscale_vnfd.yaml @@ -38,7 +38,7 @@ vnfd: max-number-of-instances: 11 min-number-of-instances: 1 virtual-link-profile: - - flavour: '' + - flavour: id: internal_services virtual-link-protocol-data: l3-protocol-data: @@ -119,7 +119,7 @@ vnfd: virtual-compute-desc: apache_vdu-compute virtual-storage-desc: - apache_vdu-storage - version: '2.1' + version: 2.1 virtual-compute-desc: - id: haproxy_vdu-compute virtual-cpu: -- GitLab