Merge branch 'sol006' into 'master' (61ee8eb5) · Commits · vnf-onboarding / OSM Packages

charm-packages/ha_proxy_charm_ns/ha_proxy_charm_nsd.yaml

100755 → 100644

+37 −39

Original line number	Diff line number	Diff line
		nsd:nsd-catalog:
		nsd:
		nsd:
		- id: ha_proxy_charm-ns
		name: ha_proxy_charm-ns
		short-name: ha_proxy_charm-ns
		description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
		version: '1.0'
		logo: osm.png
		constituent-vnfd:
		- vnfd-id-ref: ha_proxy_charm-vnf
		member-vnf-index: '1'
		- vnfd-id-ref: ha_proxy_charm-vnf
		member-vnf-index: '2'
		vld:
		description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
		df:
		- id: default-df
		vnf-profile:
		- id: '1'
		virtual-link-connectivity:
		- constituent-cpd-id:
		- constituent-base-element-id: '1'
		constituent-cpd-id: vnf-mgmt-ext
		virtual-link-profile-id: mgmtnet
		- constituent-cpd-id:
		- constituent-base-element-id: '1'
		constituent-cpd-id: vnf-data-ext
		virtual-link-profile-id: datanet
		vnfd-id: ha_proxy_charm-vnf
		- id: '2'
		virtual-link-connectivity:
		- constituent-cpd-id:
		- constituent-base-element-id: '2'
		constituent-cpd-id: vnf-mgmt-ext
		virtual-link-profile-id: mgmtnet
		- constituent-cpd-id:
		- constituent-base-element-id: '2'
		constituent-cpd-id: vnf-data-ext
		virtual-link-profile-id: datanet
		vnfd-id: ha_proxy_charm-vnf
		virtual-link-desc:
		- id: mgmtnet
		name: mgmtnet
		short-name: mgmtnet
		type: ELAN
		mgmt-network: 'true'
		vim-network-name: osm-ext
		vnfd-connection-point-ref:
		- vnfd-id-ref: ha_proxy_charm-vnf
		member-vnf-index-ref: '1'
		vnfd-connection-point-ref: vnf-mgmt
		- vnfd-id-ref: ha_proxy_charm-vnf
		member-vnf-index-ref: '2'
		vnfd-connection-point-ref: vnf-mgmt
		- id: datanet
		name: datanet
		short-name: datanet
		type: ELAN
		vnfd-connection-point-ref:
		- vnfd-id-ref: ha_proxy_charm-vnf
		member-vnf-index-ref: '1'
		vnfd-connection-point-ref: vnf-data
		- vnfd-id-ref: ha_proxy_charm-vnf
		member-vnf-index-ref: '2'
		vnfd-connection-point-ref: vnf-data

		vnfd-id:
		- ha_proxy_charm-vnf

charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml

+92 −67

Original line number	Diff line number	Diff line
		vnfd:vnfd-catalog:
		vnfd:
		- id: ha_proxy_charm-vnf
		name: ha_proxy_charm-vnf
		short-name: ha_proxy_charm-vnf
		id: ha_proxy_charm-vnf
		mgmt-cp: vnf-mgmt-ext
		product-name: ha_proxy_charm-vnf
		description: A VNF consisting of 1 VDU connected to two external VL, and one for
		data and another one for management
		version: 1.0
		description: A VNF consisting of 1 VDU connected to two external VL, and one for data and another one for management
		logo: osm.png
		connection-point:
		- id: vnf-mgmt
		name: vnf-mgmt
		short-name: vnf-mgmt
		type: VPORT
		- id: vnf-data
		name: vnf-data
		short-name: vnf-data
		type: VPORT
		mgmt-interface:
		cp: vnf-mgmt
		vdu:
		df:
		- id: default-df
		instantiation-level:
		- id: default-instantiation-level
		vdu-level:
		- number-of-instances: 1
		vdu-id: mgmtVM
		vdu-profile:
		- id: mgmtVM
		name: mgmtVM
		min-number-of-instances: 1
		vnf-configuration-id: default-vnf-configuration
		ext-cpd:
		- id: vnf-mgmt-ext
		int-cpd:
		cpd: mgmtVM-eth0-int
		vdu-id: mgmtVM
		- id: vnf-data-ext
		int-cpd:
		cpd: dataVM-xe0-int
		vdu-id: mgmtVM
		sw-image-desc:
		- id: ubuntu18.04
		image: ubuntu18.04
		count: 1
		vm-flavor:
		vcpu-count: 1
		memory-mb: 1024
		storage-gb: 10
		interface:
		name: ubuntu18.04
		vdu:
		- cloud-init-file: cloud-config.txt
		id: mgmtVM
		int-cpd:
		- id: mgmtVM-eth0-int
		virtual-network-interface-requirement:
		- name: mgmtVM-eth0
		position: 1
		type: EXTERNAL
		virtual-interface:
		type: PARAVIRT
		external-connection-point-ref: vnf-mgmt
		- id: dataVM-xe0-int
		virtual-network-interface-requirement:
		- name: dataVM-xe0
		position: 2
		type: EXTERNAL
		virtual-interface:
		type: PARAVIRT
		external-connection-point-ref: vnf-data
		cloud-init-file: cloud-config.txt
		name: mgmtVM
		sw-image-desc: ubuntu18.04
		virtual-compute-desc: mgmtVM-compute
		virtual-storage-desc:
		- mgmtVM-storage

		virtual-compute-desc:
		- id: mgmtVM-compute
		virtual-cpu:
		num-virtual-cpu: "1"
		virtual-memory:
		size: "1.0"
		virtual-storage-desc:
		- id: mgmtVM-storage
		size-of-storage: "10"
		vnf-configuration:
		juju:
		charm: simple
		- id: default-vnf-configuration
		config-access:
		ssh-access:
		default-user: ubuntu
		required: true
		config-primitive:
		- name: touch
		parameter:
		- data-type: STRING
		default-value: /home/ubuntu/touched
		name: filename
		initial-config-primitive:
		- seq: 1
		name: config
		- name: config
		parameter:
		- name: ssh-hostname
		value: <rw_mgmt_ip>
		@@ -53,15 +81,12 @@ vnfd:vnfd-catalog:
		value: ubuntu
		- name: ssh-password
		value: osm4u
		- seq: 2
		name: touch
		parameter:
		- name: filename
		data-type: STRING
		value: '/home/ubuntu/first-touch'
		config-primitive:
		seq: 1
		- name: touch
		parameter:
		- name: filename
		data-type: STRING
		default-value: '/home/ubuntu/touched'
		- data-type: STRING
		name: filename
		value: /home/ubuntu/first-touch
		seq: 2
		juju:
		charm: simple

charm-packages/k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml

100755 → 100644

+37 −39

Original line number	Diff line number	Diff line
		nsd:nsd-catalog:
		nsd:
		- id: k8s_proxy_charm-ns
		nsd:
		- description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
		df:
		- id: default-df
		vnf-profile:
		- id: '1'
		virtual-link-connectivity:
		- constituent-cpd-id:
		- constituent-base-element-id: '1'
		constituent-cpd-id: vnf-mgmt-ext
		virtual-link-profile-id: mgmtnet
		- constituent-cpd-id:
		- constituent-base-element-id: '1'
		constituent-cpd-id: vnf-data-ext
		virtual-link-profile-id: datanet
		vnfd-id: k8s_proxy_charm-vnf
		- id: '2'
		virtual-link-connectivity:
		- constituent-cpd-id:
		- constituent-base-element-id: '2'
		constituent-cpd-id: vnf-mgmt-ext
		virtual-link-profile-id: mgmtnet
		- constituent-cpd-id:
		- constituent-base-element-id: '2'
		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
		short-name: k8s_proxy_charm-ns
		description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
		version: '1.0'
		logo: osm.png
		constituent-vnfd:
		- vnfd-id-ref: k8s_proxy_charm-vnf
		member-vnf-index: '1'
		- vnfd-id-ref: k8s_proxy_charm-vnf
		member-vnf-index: '2'
		vld:
		virtual-link-desc:
		- id: mgmtnet
		name: mgmtnet
		short-name: mgmtnet
		type: ELAN
		mgmt-network: 'true'
		vim-network-name: osm-ext
		vnfd-connection-point-ref:
		- vnfd-id-ref: k8s_proxy_charm-vnf
		member-vnf-index-ref: '1'
		vnfd-connection-point-ref: vnf-mgmt
		- vnfd-id-ref: k8s_proxy_charm-vnf
		member-vnf-index-ref: '2'
		vnfd-connection-point-ref: vnf-mgmt
		- id: datanet
		name: datanet
		short-name: datanet
		type: ELAN
		vnfd-connection-point-ref:
		- vnfd-id-ref: k8s_proxy_charm-vnf
		member-vnf-index-ref: '1'
		vnfd-connection-point-ref: vnf-data
		- vnfd-id-ref: k8s_proxy_charm-vnf
		member-vnf-index-ref: '2'
		vnfd-connection-point-ref: vnf-data

		vnfd-id:
		- k8s_proxy_charm-vnf

charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml

+92 −68

Original line number	Diff line number	Diff line
		vnfd:vnfd-catalog:
		vnfd:
		- id: k8s_proxy_charm-vnf
		name: k8s_proxy_charm-vnf
		short-name: k8s_proxy_charm-vnf
		version: 1.0
		description: A VNF consisting of 1 VDU connected to two external VL, and one for data and another one for management
		logo: osm.png
		connection-point:
		- id: vnf-mgmt
		name: vnf-mgmt
		short-name: vnf-mgmt
		type: VPORT
		- id: vnf-data
		name: vnf-data
		short-name: vnf-data
		type: VPORT
		mgmt-interface:
		cp: vnf-mgmt
		vdu:
		description: A VNF consisting of 1 VDU connected to two external VL, and one for
		data and another one for management
		df:
		- id: default-df
		instantiation-level:
		- id: default-instantiation-level
		vdu-level:
		- number-of-instances: 1
		vdu-id: mgmtVM
		vdu-profile:
		- id: mgmtVM
		name: mgmtVM
		min-number-of-instances: 1
		vnf-configuration-id: default-vnf-configuration
		ext-cpd:
		- id: vnf-mgmt-ext
		int-cpd:
		cpd: mgmtVM-eth0-int
		vdu-id: mgmtVM
		- id: vnf-data-ext
		int-cpd:
		cpd: dataVM-xe0-int
		vdu-id: mgmtVM
		id: k8s_proxy_charm-vnf
		mgmt-cp: vnf-mgmt-ext
		product-name: k8s_proxy_charm-vnf
		sw-image-desc:
		- id: ubuntu18.04
		image: ubuntu18.04
		count: 1
		vm-flavor:
		vcpu-count: 1
		memory-mb: 1024
		storage-gb: 10
		interface:
		name: ubuntu18.04
		vdu:
		- cloud-init-file: cloud-config.txt
		id: mgmtVM
		int-cpd:
		- id: mgmtVM-eth0-int
		virtual-network-interface-requirement:
		- name: mgmtVM-eth0
		position: 1
		type: EXTERNAL
		virtual-interface:
		type: PARAVIRT
		external-connection-point-ref: vnf-mgmt
		- id: dataVM-xe0-int
		virtual-network-interface-requirement:
		- name: dataVM-xe0
		position: 2
		type: EXTERNAL
		virtual-interface:
		type: PARAVIRT
		external-connection-point-ref: vnf-data
		cloud-init-file: cloud-config.txt
		name: mgmtVM
		sw-image-desc: ubuntu18.04
		virtual-compute-desc: mgmtVM-compute
		virtual-storage-desc:
		- mgmtVM-storage
		version: 1.0
		virtual-compute-desc:
		- id: mgmtVM-compute
		virtual-cpu:
		num-virtual-cpu: 1
		virtual-memory:
		size: 1.0
		virtual-storage-desc:
		- id: mgmtVM-storage
		size-of-storage: 10
		vnf-configuration:
		juju:
		charm: simple
		cloud: k8s
		- config-primitive:
		- name: touch
		parameter:
		- data-type: STRING
		default-value: /home/ubuntu/touched
		name: filename
		config-access:
		ssh-access:
		default-user: ubuntu
		required: true
		id: default-vnf-configuration
		initial-config-primitive:
		- seq: 1
		name: config
		- name: config
		parameter:
		- name: ssh-hostname
		value: <rw_mgmt_ip>
		@@ -54,15 +80,13 @@ vnfd:vnfd-catalog:
		value: ubuntu
		- name: ssh-password
		value: osm4u
		- seq: 2
		name: touch
		parameter:
		- name: filename
		data-type: STRING
		value: '/home/ubuntu/first-touch'
		config-primitive:
		seq: 1
		- name: touch
		parameter:
		- name: filename
		data-type: STRING
		default-value: '/home/ubuntu/touched'
		- data-type: STRING
		name: filename
		value: /home/ubuntu/first-touch
		seq: 2
		juju:
		charm: simple
		cloud: k8s

charm-packages/native_charm_ns/native_charm_nsd.yaml

100755 → 100644

+37 −39

Original line number	Diff line number	Diff line
		nsd:nsd-catalog:
		nsd:
		- id: native_charm-ns
		nsd:
		- description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
		df:
		- id: default-df
		vnf-profile:
		- id: '1'
		virtual-link-connectivity:
		- constituent-cpd-id:
		- constituent-base-element-id: '1'
		constituent-cpd-id: vnf-mgmt-ext
		virtual-link-profile-id: mgmtnet
		- constituent-cpd-id:
		- constituent-base-element-id: '1'
		constituent-cpd-id: vnf-data-ext
		virtual-link-profile-id: datanet
		vnfd-id: native_charm-vnf
		- id: '2'
		virtual-link-connectivity:
		- constituent-cpd-id:
		- constituent-base-element-id: '2'
		constituent-cpd-id: vnf-mgmt-ext
		virtual-link-profile-id: mgmtnet
		- constituent-cpd-id:
		- constituent-base-element-id: '2'
		constituent-cpd-id: vnf-data-ext
		virtual-link-profile-id: datanet
		vnfd-id: native_charm-vnf
		id: native_charm-ns
		name: native_charm-ns
		short-name: native_charm-ns
		description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
		version: '1.0'
		logo: osm.png
		constituent-vnfd:
		- vnfd-id-ref: native_charm-vnf
		member-vnf-index: '1'
		- vnfd-id-ref: native_charm-vnf
		member-vnf-index: '2'
		vld:
		virtual-link-desc:
		- id: mgmtnet
		name: mgmtnet
		short-name: mgmtnet
		type: ELAN
		mgmt-network: 'true'
		vim-network-name: osm-ext
		vnfd-connection-point-ref:
		- vnfd-id-ref: native_charm-vnf
		member-vnf-index-ref: '1'
		vnfd-connection-point-ref: vnf-mgmt
		- vnfd-id-ref: native_charm-vnf
		member-vnf-index-ref: '2'
		vnfd-connection-point-ref: vnf-mgmt
		- id: datanet
		name: datanet
		short-name: datanet
		type: ELAN
		vnfd-connection-point-ref:
		- vnfd-id-ref: native_charm-vnf
		member-vnf-index-ref: '1'
		vnfd-connection-point-ref: vnf-data
		- vnfd-id-ref: native_charm-vnf
		member-vnf-index-ref: '2'
		vnfd-connection-point-ref: vnf-data

		vnfd-id:
		- native_charm-vnf