From f77f8c6d4e253c97bbd42e72b5c58053a5095ad2 Mon Sep 17 00:00:00 2001 From: Anurag Dwivedi Date: Wed, 5 Apr 2017 05:39:56 -0400 Subject: [PATCH] Bug 91 : VNF names and NS names in the descriptor packages use a confusing suffix vnfd and nsd Signed-off-by: Anurag Dwivedi --- src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml | 4 ++-- src/nsd/cirros_ns/cirros_nsd.yaml | 4 ++-- src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml | 4 ++-- src/vnfd/cirros_vnf/cirros_vnfd.yaml | 4 ++-- src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml b/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml index f0908757..ed9433f4 100644 --- a/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml +++ b/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml @@ -1,8 +1,8 @@ nsd:nsd-catalog: nsd: - id: cirros_2vnf_nsd - name: cirros_2vnf_nsd - short-name: cirros_2vnf_nsd + name: cirros_2vnf_ns + short-name: cirros_2vnf_ns description: Generated by OSM pacakage generator vendor: OSM version: '1.0' diff --git a/src/nsd/cirros_ns/cirros_nsd.yaml b/src/nsd/cirros_ns/cirros_nsd.yaml index 364d368e..96d0f609 100644 --- a/src/nsd/cirros_ns/cirros_nsd.yaml +++ b/src/nsd/cirros_ns/cirros_nsd.yaml @@ -1,8 +1,8 @@ nsd:nsd-catalog: nsd: - id: cirros_nsd - name: cirros_nsd - short-name: cirros_nsd + name: cirros_ns + short-name: cirros_ns description: Generated by OSM pacakage generator vendor: OSM version: '1.0' diff --git a/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml b/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml index daf84bdf..7f91d439 100644 --- a/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml +++ b/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml @@ -1,8 +1,8 @@ nsd:nsd-catalog: nsd: - id: ubuntu_xenial_nsd - name: ubuntu_xenial_nsd - short-name: ubuntu_xenial_nsd + name: ubuntu_xenial_ns + short-name: ubuntu_xenial_ns description: Generated by OSM pacakage generator vendor: OSM version: '1.0' diff --git a/src/vnfd/cirros_vnf/cirros_vnfd.yaml b/src/vnfd/cirros_vnf/cirros_vnfd.yaml index b4b98e25..e9209e74 100644 --- a/src/vnfd/cirros_vnf/cirros_vnfd.yaml +++ b/src/vnfd/cirros_vnf/cirros_vnfd.yaml @@ -1,8 +1,8 @@ vnfd:vnfd-catalog: vnfd: - id: cirros_vnfd - name: cirros_vnfd - short-name: cirros_vnfd + name: cirros_vnf + short-name: cirros_vnf description: Simple VNF example with a cirros vendor: OSM version: '1.0' diff --git a/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml b/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml index 8fd61d9e..ee6a3ac7 100644 --- a/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml +++ b/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml @@ -1,8 +1,8 @@ vnfd:vnfd-catalog: vnfd: - id: ubuntu_xenial_vnfd - name: ubuntu_xenial_vnfd - short-name: ubuntu_xenial_vnfd + name: ubuntu_xenial_vnf + short-name: ubuntu_xenial_vnf description: Generated by OSM pacakage generator vendor: OSM version: '1.0' -- 2.25.1