Skip to content
Snippets Groups Projects
Commit bb39f86b authored by aguilard's avatar aguilard
Browse files

Renamed deprecated identifiers such as '1' in 'vnf-profile' section. 

Removed quotes in YAML descriptor files.
parent 0cc5a2e1
No related branches found
No related tags found
1 merge request!187Renamed deprecated identifiers in 'vnf-profile' section.
Pipeline #5120 passed with stage
Stage:
    in 1 minute and 46 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 95 additions and 95 deletions
    charm-packages/cmr_relation_ns/cmr_relation_nsd.yaml
    + 2
    − 2
    View file @ bb39f86b
    ......@@ -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
    ......
    charm-packages/ha_proxy_charm_ns/ha_proxy_charm_nsd.yaml
    + 8
    − 8
    View file @ bb39f86b
    ......@@ -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
    charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml
    + 3
    − 3
    View file @ bb39f86b
    ......@@ -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
    charm-packages/k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml
    + 8
    − 8
    View file @ bb39f86b
    ......@@ -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
    charm-packages/native_charm_centos_ns/native_charm_centos_nsd.yaml
    + 4
    − 4
    View file @ bb39f86b
    ......@@ -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
    charm-packages/native_charm_ns/native_charm_nsd.yaml
    + 8
    − 8
    View file @ bb39f86b
    ......@@ -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
    charm-packages/native_k8s_charm_ns/native_k8s_charm_nsd.yaml
    + 1
    − 1
    View file @ bb39f86b
    ......@@ -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
    ......
    charm-packages/native_k8s_scale_charm_ns/native_k8s_scale_charm_nsd.yaml
    + 1
    − 1
    View file @ bb39f86b
    ......@@ -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
    ......
    charm-packages/native_manual_scale_charm_ns/native_charm_nsd.yaml
    + 5
    − 5
    View file @ bb39f86b
    ......@@ -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
    charm-packages/nopasswd_k8s_proxy_charm_ns/nopasswd_k8s_proxy_charm_nsd.yaml
    + 8
    − 8
    View file @ bb39f86b
    ......@@ -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
    charm-packages/nopasswd_proxy_charm_ns/nopasswd_proxy_charm_nsd.yaml
    + 8
    − 8
    View file @ bb39f86b
    ......@@ -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
    charm-packages/ns_relations_ns/ns_relations_nsd.yaml
    + 8
    − 8
    View file @ bb39f86b
    ......@@ -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
    charm-packages/pebble_charm_ns/pebble_nsd.yaml
    + 1
    − 1
    View file @ bb39f86b
    ......@@ -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
    ......
    charm-packages/proxy_native_relation_ns/proxy_native_relation_nsd.yaml
    + 5
    − 5
    View file @ bb39f86b
    ......@@ -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
    charm-packages/sol007_k8s_proxy_charm_ns/sol007_k8s_proxy_charm_nsd.yaml
    + 8
    − 8
    View file @ bb39f86b
    ......@@ -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
    charm-packages/vnf_relations_ns/vnf_relations_nsd.yaml
    + 5
    − 5
    View file @ bb39f86b
    ......@@ -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
    cirros_alarm_ns/cirros_alarm_nsd.yaml
    + 3
    − 3
    View file @ bb39f86b
    ......@@ -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
    ......
    cirros_alarm_vnf/cirros_alarm_vnfd.yaml
    + 1
    − 1
    View file @ bb39f86b
    ......@@ -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:
    ......
    epa_1vm_passthrough_ns/epa_1vm_passthrough_nsd.yaml
    + 7
    − 7
    View file @ bb39f86b
    ......@@ -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
    ......
    epa_1vm_passthrough_vnf/epa_1vm_passthrough_vnfd.yaml
    + 1
    − 1
    View file @ bb39f86b
    ......@@ -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:
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment