Commit 3e6e1595 authored by garciadeblas's avatar garciadeblas
Browse files

Merge branch 'vnf-profile-id' into 'master' 

Renamed deprecated identifiers in 'vnf-profile' section.

See merge request !187
parents 0cc5a2e1 bb39f86b

charm-packages/cmr_relation_ns/cmr_relation_nsd.yaml

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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