Add cirros vnf and ns
Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
diff --git a/Makefile b/Makefile
index 6a5a4d8..5ec633e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
#
BUILD_DIR = build
-NSDS := gw_corpa_ns ims_allin1_corpa mwc16_gen_ns mwc16_pe_ns VyOS_ns
+NSDS := gw_corpa_ns ims_allin1_corpa mwc16_gen_ns mwc16_pe_ns VyOS_ns cirros_ns cirros_2vnf_ns
NSD_SRC_DIR := src/nsd
NSD_BUILD_DIR := $(BUILD_DIR)/nsd
@@ -27,7 +27,7 @@
NSD_PKGS := $(addsuffix .tar.gz, $(NSDS))
NSD_BUILD_PKGS := $(addprefix $(NSD_BUILD_DIR)_pkgs/, $(NSD_PKGS))
-VNFDS := 6wind_vnf gw_corpa_pe1_vnf gw_corpa_pe2_vnf ims_allin1_2p_vnf tidgen_mwc16_vnf VyOS_vnf
+VNFDS := 6wind_vnf gw_corpa_pe1_vnf gw_corpa_pe2_vnf ims_allin1_2p_vnf tidgen_mwc16_vnf VyOS_vnf cirros_vnf
VNFD_SRC_DIR := src/vnfd
VNFD_BUILD_DIR := $(BUILD_DIR)/vnfd
diff --git a/src/nsd/VyOS_ns/VyOS_nsd.yaml b/src/nsd/VyOS_ns/VyOS_nsd.yaml
index 3344baa..5b016da 100644
--- a/src/nsd/VyOS_ns/VyOS_nsd.yaml
+++ b/src/nsd/VyOS_ns/VyOS_nsd.yaml
@@ -30,7 +30,7 @@
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: eth0
vnfd-id-ref: VyOS
- config-primitive:
+ service-primitive:
- name: Config VyOS
vnf-primitive-group:
- member-vnf-index-ref: '1'
diff --git a/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml b/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml
new file mode 100644
index 0000000..cbf8ed3
--- /dev/null
+++ b/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml
@@ -0,0 +1,44 @@
+nsd:nsd-catalog:
+ nsd:
+ - id: cirros_2vnf_nsd
+ name: cirros_2vnf_nsd
+ short-name: cirros_2vnf_nsd
+ description: Generated by OSM pacakage generator
+ vendor: OSM
+ version: '1.0'
+
+ # Place the logo as png in icons directory and provide the name here
+ logo: osm_2x.png
+
+ # Specify the VNFDs that are part of this NSD
+ constituent-vnfd:
+ # The member-vnf-index needs to be unique, starting from 1
+ # vnfd-id-ref is the id of the VNFD
+ # Multiple constituent VNFDs can be specified
+ - member-vnf-index: 1
+ vnfd-id-ref: cirros_vnfd
+ - member-vnf-index: 2
+ vnfd-id-ref: cirros_vnfd
+
+
+ vld:
+ # Networks for the VNFs
+ - id: cirros_2vnf_nsd_vld1
+ name: cirros_2vnf_nsd_vld1
+ short-name: cirros_2vnf_nsd_vld1
+ type: ELAN
+ # provider-network:
+ # overlay-type: VLAN
+ # physical-network: <update>
+ # segmentation_id: <update>
+ vnfd-connection-point-ref:
+ # Specify the constituent VNFs
+ # member-vnf-index-ref - entry from constituent vnf
+ # vnfd-id-ref - VNFD id
+ # vnfd-connection-point-ref - connection point name in the VNFD
+ - nsd:member-vnf-index-ref: 1
+ nsd:vnfd-id-ref: cirros_vnfd
+ nsd:vnfd-connection-point-ref: eth0
+ - nsd:member-vnf-index-ref: 2
+ nsd:vnfd-id-ref: cirros_vnfd
+ nsd:vnfd-connection-point-ref: eth0
diff --git a/src/nsd/cirros_2vnf_ns/icons/osm_2x.png b/src/nsd/cirros_2vnf_ns/icons/osm_2x.png
new file mode 100644
index 0000000..62012d2
--- /dev/null
+++ b/src/nsd/cirros_2vnf_ns/icons/osm_2x.png
Binary files differ
diff --git a/src/nsd/cirros_ns/cirros_nsd.yaml b/src/nsd/cirros_ns/cirros_nsd.yaml
new file mode 100644
index 0000000..54c5939
--- /dev/null
+++ b/src/nsd/cirros_ns/cirros_nsd.yaml
@@ -0,0 +1,38 @@
+nsd:nsd-catalog:
+ nsd:
+ - id: cirros_nsd
+ name: cirros_nsd
+ short-name: cirros_nsd
+ description: Generated by OSM pacakage generator
+ vendor: OSM
+ version: '1.0'
+
+ # Place the logo as png in icons directory and provide the name here
+ logo: osm_2x.png
+
+ # Specify the VNFDs that are part of this NSD
+ constituent-vnfd:
+ # The member-vnf-index needs to be unique, starting from 1
+ # vnfd-id-ref is the id of the VNFD
+ # Multiple constituent VNFDs can be specified
+ - member-vnf-index: 1
+ vnfd-id-ref: cirros_vnfd
+
+ vld:
+ # Networks for the VNFs
+ - id: cirros_nsd_vld1
+ name: cirros_nsd_vld1
+ type: ELAN
+ # provider-network:
+ # overlay-type: VLAN
+ # physical-network: <update>
+ # segmentation_id: <update>
+ vnfd-connection-point-ref:
+ # Specify the constituent VNFs
+ # member-vnf-index-ref - entry from constituent vnf
+ # vnfd-id-ref - VNFD id
+ # vnfd-connection-point-ref - connection point name in the VNFD
+ - nsd:member-vnf-index-ref: 1
+ nsd:vnfd-id-ref: cirros_vnfd
+ # NOTE: Validate the entry below
+ nsd:vnfd-connection-point-ref: eth0
diff --git a/src/nsd/cirros_ns/icons/osm_2x.png b/src/nsd/cirros_ns/icons/osm_2x.png
new file mode 100644
index 0000000..62012d2
--- /dev/null
+++ b/src/nsd/cirros_ns/icons/osm_2x.png
Binary files differ
diff --git a/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml b/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
index 9283995..95e5f46 100644
--- a/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
+++ b/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
@@ -32,7 +32,7 @@
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: eth1
vnfd-id-ref: IMS-ALLIN1_2p
- config-primitive:
+ service-primitive:
- name: Update Domain
vnf-primitive-group:
- member-vnf-index-ref: '1'
diff --git a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
index af6a4a3..c0f238c 100644
--- a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
+++ b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
@@ -11,7 +11,7 @@
config-attributes:
config-delay: '0'
config-priority: '1'
- config-primitive:
+ service-primitive:
- name: config
parameter:
- name: user
@@ -19,7 +19,7 @@
mandatory: 'true'
default-value: vyos
- name: pass
- data-type: string
+ data-type: STRING
mandatory: 'true'
default-value: vyos
- name: ping
diff --git a/src/vnfd/cirros_vnf/cirros_vnfd.yaml b/src/vnfd/cirros_vnf/cirros_vnfd.yaml
new file mode 100644
index 0000000..b7cb036
--- /dev/null
+++ b/src/vnfd/cirros_vnf/cirros_vnfd.yaml
@@ -0,0 +1,45 @@
+vnfd:vnfd-catalog:
+ vnfd:
+ - id: cirros_vnfd
+ name: cirros_vnfd
+ short-name: cirros_vnfd
+ description: Generated by OSM pacakage generator
+ vendor: OSM
+ version: '1.0'
+
+ # Place the logo as png in icons directory and provide the name here
+ logo: cirros-64.png
+
+ # Management interface
+ mgmt-interface:
+ vdu-id: cirros_vnfd-VM
+
+ # Atleast one VDU need to be specified
+ vdu:
+ - id: cirros_vnfd-VM
+ name: cirros_vnfd-VM
+ description: cirros_vnfd-VM
+ count: 1
+
+ # Flavour of the VM to be instantiated for the VDU
+ vm-flavor:
+ vcpu-count: 1
+ memory-mb: 512
+ storage-gb: 1
+
+ # Image including the full path
+ image: '/mnt/powervault/virtualization/osm/CirrOS/cirros-0.3.4-x86_64-disk.img'
+
+ external-interface:
+ # Specify the external interfaces
+ # There can be multiple interfaces defined
+ - name: eth0
+ virtual-interface:
+ type: OM-MGMT
+ bandwidth: '0'
+ vpci: 0000:00:0a.0
+ vnfd-connection-point-ref: eth0
+
+ connection-point:
+ - name: eth0
+ type: VPORT
diff --git a/src/vnfd/cirros_vnf/icons/cirros-64.png b/src/vnfd/cirros_vnf/icons/cirros-64.png
new file mode 100644
index 0000000..5725d29
--- /dev/null
+++ b/src/vnfd/cirros_vnf/icons/cirros-64.png
Binary files differ
diff --git a/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml b/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml
index d02fc0b..b73e110 100644
--- a/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml
+++ b/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml
@@ -11,7 +11,7 @@
config-attributes:
config-delay: '0'
config-priority: '1'
- config-primitive:
+ service-primitive:
- name: config
parameter:
- name: home_domain
@@ -21,7 +21,6 @@
- name: password
data-type: string
mandatory: 'true'
- name: password
default-value: cw-aio
- name: create-update-user
parameter:
