diff --git a/charm-packages/cmr_relation_ns/cmr_relation_nsd.yaml b/charm-packages/cmr_relation_ns/cmr_relation_nsd.yaml index 8c3c6419a9fb639eccaa0172fc08e8165b3c9c8a..c373bff99f91a7ba5b7a205c515d380b8e6b4866 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 b9cb16a0ebbb47d9b22179263c2d9124683af21c..89bad7fbfd9b0210d21709f512c5fb3255692adb 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 81c678841448c81720c3beebc97ed7ac49f57fb8..e5c2adbefab2b6dcc54a999294a2ed4ea1e5db57 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 beae3243b71a197f06f18c76c3fb3d277842df19..9b72b51de43f2a9d2ce68685a0ea66bb6b61c7f5 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 63e9929172d9e2fc651819cdb098e60abcd538f9..1647d6a0514ac86dbe3b7f34ca437686e7fb4a83 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 43633090c6a3e9289bef2fdb161aec40e3fbd0e6..9cfef32e398250a77eb499d765e077e0ab3db52c 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 96897b9434bcd9a54bf16d5207f9ff45010fee0a..6ceba238516c41097370b1f6227252c37a343085 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 84df0ed12b36f5cd2b2888796bb780d15fe8bf90..8e5b7f0c47b031f302a09e2a79e83d1e15543f5f 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 2754bbd4c1c41b45a28b78613bfae9358f6f89ff..66eef6aca9fef2d9b28ef760601aca5ef498d209 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 8b75bb26f06e33963b54f2ba00e3a56c93d80121..2738e082c3f9702f56c8bacdcf65fe07c1614bdd 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 859525bedcdb4e23f0fd438840f8c5ab6dc8f262..d7c31aad9a531a24550b270345845db1f6de0243 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 6a10331c5c314038f0f7c1ed04e496f45b72450a..cd694c987b06d3608487a2f28192aea5b391d42a 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 87d53be0b9e0e1f34435231765ac88ea2238ec5f..31715f13ffd81905b2806b855c0e2e26dc412cca 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 4039eb76a10c88965107ccfcd42fc468f1c7adce..1933bae6eed5706096ac35f05f22a5f5d05d51d5 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 d4382cd582a194b3837306cf354ace1bac93717e..3fdcb24c48a12923c0c09e2e707ee75e546367a2 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 a4578c5be4ce175423d60c1fb430db96b35a1d0e..ce549a7d55ec7d93370f321fcfe3556c4d521cd0 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 40030c295259ca34aadbe2bc66068630e274b928..c457683a898d5956a023ebfc76d5aba305d9f606 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 411902309a4642352a27b3de38f5ce334f79c841..718ee94bc315285227f5e220527d98968e4891fa 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 35bcd0c31836c469f88e1f430bba429aa1472466..b5d9a0a3c661baa1125157f106d8bc7f7ce0657a 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 8a2843e3db9e7d5369dc95d3418ec5e0cd79d46a..2bb6bc83d8ef68787680cb2ccd72a25bebfcb41f 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 a0c66e51b953615d0b4ec761103e2fd5614fe582..a5fb5c1d89738b26d5e7f242a55e5f5227cb6c0f 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 78b59432595e44dc5de52bad2b80f68f6fce8650..e1c89eca8d6f8524ce3b6267f6728d29a105c81c 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 57ae239725b33b9ab46ce11bed72c2f69a119d93..8945ea351b37aaffef0a8caeeef9fb3e87031419 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 cdd4140bb9a77bd10e7e819576542acb927de583..915e1e056a07bfcfbf5fdf59faa9394fd1a6f66f 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 c5d4a0cb8fb914ce6c081f95d7829302d6796c7e..938cc7da43d483ea5cc9556e8b4561bae49307cb 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 809d2ad923c418cd4398ae2c3ddbd38907d220c3..5f328c8159307be5840373aec9e3ade6528523d9 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 a9f95c74c750cf58cec9598492a21ea88de0ef55..f1f759db72d21cd6a5615e68068a105d3b8a3553 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 e83eb3ddb9f9f2e3647d942cf06b47678be12d85..4153a17162c5da2a4b805ded0c03ddca54c60609 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 be76b264172ba0f906d2b6d84e48c7542154e9e4..b75103708a97d9e6998228f02e6c52dcd1827c60 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 7f7397b02d6d34db89132da39cdb8dd646e3ecf2..9b363316201e07bdf20214f2c5e79707ba436522 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 d8874bf5143470c36dc342b30798fc00c34a54b1..e7310c30a27357f22152d3866b21257a3c5bc9a2 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 4625e424a1ac97679e4053284cd719c02fbef927..25676ef8b1490d7397d9893e1ffb35593d34fa72 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 bd8283cdb74d1eebae2ea2878909e393ff385567..263cd6fe345188c819964f5b9142241cd7453a67 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 49f6d2991cc015da818c1ae03d5cbe335ec81740..8f9b1dccb5201414e91bb1e1f9244c2a6045d1db 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 74a896aa3beac73bb84a4c35a320ce8f2def4a56..6756c27ee529acad5832e718ca71b4d376371233 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 87bc4aa1b20ac0499b3427e98a5664eecd0f1941..c1cc81b888ff2c4535bfb11e6948c14880d49a9b 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 b39a5ecb6f660c1a0957d122b6102327705d4fb2..0b32433f9601a5812112fcae6f32f8a12a71aa82 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 a8f8e924c09370bcae53986ec1417b81c0974f20..09c3049570da97120a66ee21cce822953a1a47d4 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 7cb449be6730b041cc95e667d12f67fa641d9210..28b9fbae91d2e5506aad0305be77c464c0bc7e44 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 cdf103295da96cd171a1232321f0178ab38dc6cb..6ed2d81a73d5e01f194f005f7de6553e002818e7 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 dcf32908e279d42c039a0820641d786d74943c98..a0eb5b1179bff2aad5096d0141415d69101db82f 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 6637cf598d08b76a377af1169dd7281fcb5372cf..cdb6bcb66aae445f4c6d27f1b84e61bce4a84b4f 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 f6dcb6ba305f18da4406d705a1b11b815467641a..615576c67f8ba638fc098f24a056a835cd5e70c5 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 ae421383b23ad15e2e8a84ec022f8ddd8ad01f2c..b724abb628a819382014792d191dc5268fd5b869 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 e8a889ebac881054ad9e8e21db74647d93ac7997..358518c07ea98976e3043d98bde7fa307b689925 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 fb8c4ea309b7a7044a0189d6e503df4a423a4011..5209ed08622afddf6442a121fcbe22e5747c24f1 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 dff3c9d8def2a7db858012c7153ed1e77418fe26..938bc44cff824f04f9d5f5e23db401fafe915b39 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 a44d01863d39a724d59346049499d0e023797169..f7379b26e356d9df8665c6a4bbf3769a7207d77b 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 acbf2474287ba2c3f2464197575a9fb030c32b6b..fade33ee61faf578d2e772b14d5ff07b064c82db 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 2195f42d77ace235dcdc92b22d8a0e357a83448e..622910db35eb3112b7ced492a6da304c640aec12 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 494235a2fed77848cb64b14ef1bd4cfe010e5848..f7697b3a477341476418a3e28915b5bae994223e 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 2d83c3f9dc1e5f115e1065263ac781766bfd9d54..0e6abdd459008a05ba740f14c4ef9c1ec1a44a4e 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 aa36621116197adecdd6c7cdf9c704f0b2b66a5f..9479055edca6e1d4418e8343f44b163ebd1e90dd 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 068ed7499d2ba09bb8ec014f6a6159a9b044d2fb..43de81b9f38ec03388dad74495c43549025246a7 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 3cd817fc0106011558429fc782c3c98d5e5fffcc..d6856e969f421268c7c5800a4a93af459c96528c 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 f2cf5089214b86e6cc75496dbbe696d4693a909a..2bd0e24ed924dedfc749918a13d748e4fdaa4d86 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 43717cfe1f7d8796180166f0c9927dbd8fa54bfc..a78891024268e4e8c094def5573946248e38bad5 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 8c955dae81eb186f284849ba96f15936a321cc22..347d27d55285d9e0cc30e94db9a98c1845c11659 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 424020aff05ef6304160e7abfd9606ed52d22fca..f177900f6bd77d1dbe7d4530407e2b46065d8ef3 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 871a35feeb39b777e13f0848c925f77894fc8bc0..886f80bf46245d3a193873bace4d1ac73c3557ba 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 5aaaeecaf6b1d1e393cbaa783b0fe1bf4084fe1f..699c48ea5317d21043aaf3af49ac01c234390e80 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 65f6aa912cf2faf004e7e5b4d30f1b3e39c3f45a..8df7c4791b03e282670e216a77349fd7173a4f42 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 1abef5061256f781b92a52bb6f031cf47cfa52e3..86635cf5c6e4ab1d1d520700034eb4882a227a0a 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 152efa66499c94955afd1e6dc69f3864e25e9a2c..ce8b112fbfd672360197f1cd36386f70ae9f8f91 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 b995164c2e9783383d8f2f571a19aa281f060c1e..980fd2e8f8921813d6074fb8bfdb44a94182d57a 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 bc892a20ce2142db93d0fd52cbb03d54e721bd69..54729a2903decb6f07cb727069ff7ade473deb06 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 783ca9fff2a4b3fd4648df3a39982d69fe1d1c38..65aa17c7108399ec26d1714e44745323f2909da0 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 0f6d44b52ab2d4d1157468ab31e059ca14f8dfce..00dcda85ef7c2ddabf2c0a90e116c95b3d3ea108 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 d528a5c6b0b2acc3112458052db24b9c29ff6fb1..dad64aaeebe630090f5b9884f8116324f688d688 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 30726a294ca15d88e125a5045d7a54da7492c296..e9bea9f27699f4f34a7a950c0280fbe8b4454766 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 f4305ec475ace6d7ca3f1b81b80a9382fc47188e..6f6e0d1ae9039501ba37acc3341d3dab516826c0 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 27194655c0f53296024b8bbc4db0711448b2b7b5..bf61ade106d613030edd0ae4d87c538f52f37949 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 562af4d25c921e675b0b0ea5a724f95d0219ff00..ddd978ff773192c89f48d89ce1e1bbf7a069d33f 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 eb478520e8267e36f65bad69584e8562806b5f6c..d3723a9476128af54e4ef733f5222fa612e5e80d 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 3190ed042f17a69e03efe7b25badc9fc00017d04..ed8389daf2072ceb44b11a3e15a74593375083a5 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 a87c2c19b514e18341b7300921d8c1a82ea2829a..7e0bb09748359693cc2019b42f067b228309199b 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 2da176c60ae6dbcda3664f3e807f26413d691936..fd35f0bb4c776c528c67948222c6c6ef8c7b1603 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 ec9b66d52565980dc7f49fa773c56f53183cc020..ddaea5507531eedeb9d9c672fc66a4dccd13a98c 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 bb84cc1e2614c5bb95978f7e32cbe93d3cc876c2..7af1cfbda30ef103babd1e1769a6646e4d3d7e4f 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 a7eabf0d308cbad3c8ef5410f1cd41e8587a1579..d4a74eb3550d52e92206891b2de752647657bbbd 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 ae6de4d5d719b0f9acae5f032404c72b3e9a960e..3a6037e9f346dd63d95bd440b6642d71193bff73 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 478e0322c21c07c571b5bec433835f7ac49ce228..c785c85886004e1ea144fe2c9108db45b57c44c3 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 8576e17f7c1d4a799c392ea6553cf7de6bfb0fb2..1b78cc2e755ab65ce13a5e8bb9a5516d55d0be97 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 8eceee811cf94ec2e9f03984782bc767c65c5f17..b383a66af37a5b2683f5a798ae921967fdbe7391 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 2d2abd0399393701d49722aaf7d9081b21e3ae77..eb78eeee2e7c6fdb0e70d8bdb09dd27c2dac5d05 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 5d9259323f3dfc6bb531b08c096018694d130ef9..ae609b873732fc5ebb4e840765d2498fbbf1c2ca 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 871a35feeb39b777e13f0848c925f77894fc8bc0..886f80bf46245d3a193873bace4d1ac73c3557ba 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 1078aa8b10a2e463531fc39f8ccf5e88f287fe8c..d22386c6ac8b5e28048caf8e9fc105bf11d1187b 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 2cb11410b730fe0bbaf44bac0093237d9aa56073..a31e65432802b35e8293966802d260ec3221fbb0 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 ea9b4239978cd58fbdbafd47ae7f31156a7e27e7..07a70b1d20454d1ad708ed2b6b1c4f78f5780e6b 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 45b94806b2b5304fe933fa85cfc5e8f5d5c398cf..3d600ccd6fcffba5a10b2bd85755939769dae0b9 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 a3f2599c68805730730b8228baeb1a3ce35bbe4c..847c3fb680aca7c45b2d5bc888a83b36a3939d6c 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 8c7fbc1eb806723591690bd7dbb15d9014cdd962..58f6b22c14cecfd04b0d8aaf48d53268630e2fd4 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 f3fa3dd4ecfb396e71131dc141299ad2cb05a1fd..59d0ccca89d6739a28f5149bc3fe6ccf27ef34eb 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 3154afe8d8db5ac2d69e2a43de1a2ef669aee228..4b46c5bac649f47961960f87d6873948021e5f2e 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: