modified some pacakages to adapt to latest version from master (5428e637) · Commits · vnf-onboarding / OSM Packages

charm-packages/native_charm_vnf/native_charm_vnfd.yaml

+28 −23

Original line number	Diff line number	Diff line
		@@ -11,7 +11,34 @@ vnfd:
		vdu-profile:
		- id: mgmtVM
		min-number-of-instances: 1
		vdu-configuration-id: mgmtVM-vdu-configuration
		lcm-operations-configuration:
		operate-vnf-op-config:
		day1-2:
		- config-access:
		ssh-access:
		default-user: ubuntu
		required: true
		config-primitive:
		- name: touch
		execution-environment-ref: simple-ee
		parameter:
		- data-type: STRING
		default-value: /home/ubuntu/touched
		name: filename
		id: mgmtVM
		execution-environment-list:
		- id: simple-ee
		juju:
		charm: simple
		proxy: false
		initial-config-primitive:
		- name: touch
		execution-environment-ref: simple-ee
		parameter:
		- data-type: STRING
		name: filename
		value: /home/ubuntu/first-touch
		seq: 1
		ext-cpd:
		- id: vnf-mgmt-ext
		int-cpd:
		@@ -60,28 +87,6 @@ vnfd:
		virtual-compute-desc: mgmtVM-compute
		virtual-storage-desc:
		- mgmtVM-storage
		vdu-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
		id: mgmtVM-vdu-configuration
		initial-config-primitive:
		- name: touch
		parameter:
		- data-type: STRING
		name: filename
		value: /home/ubuntu/first-touch
		seq: 1
		juju:
		charm: simple
		proxy: false
		version: 1.0
		virtual-compute-desc:
		- id: mgmtVM-compute

charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml

+35 −29

Original line number	Diff line number	Diff line
		@@ -11,7 +11,41 @@ vnfd:
		vdu-profile:
		- id: mgmtVM
		min-number-of-instances: 1
		vnf-configuration-id: default-vnf-configuration
		lcm-operations-configuration:
		operate-vnf-op-config:
		day1-2:
		- config-access:
		ssh-access:
		default-user: ubuntu
		required: true
		config-primitive:
		- name: touch
		execution-environment-ref: simple-ee
		parameter:
		- data-type: STRING
		default-value: /home/ubuntu/touched
		name: filename
		id: nopasswd_proxy_charm-vnf
		execution-environment-list:
		- id: simple-ee
		juju:
		charm: simple
		initial-config-primitive:
		- name: config
		execution-environment-ref: simple-ee
		parameter:
		- name: ssh-hostname
		value: <rw_mgmt_ip>
		- name: ssh-username
		value: ubuntu
		seq: 1
		- name: touch
		execution-environment-ref: simple-ee
		parameter:
		- data-type: STRING
		name: filename
		value: /home/ubuntu/first-touch
		seq: 2
		ext-cpd:
		- id: vnf-mgmt-ext
		int-cpd:
		@@ -70,31 +104,3 @@ vnfd:
		virtual-storage-desc:
		- id: mgmtVM-storage
		size-of-storage: 10
		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
		id: default-vnf-configuration
		initial-config-primitive:
		- name: config
		parameter:
		- name: ssh-hostname
		value: <rw_mgmt_ip>
		- name: ssh-username
		value: ubuntu
		seq: 1
		- name: touch
		parameter:
		- data-type: STRING
		name: filename
		value: /home/ubuntu/first-touch
		seq: 2
		juju:
		charm: simple

charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml

+74 −55

Original line number	Diff line number	Diff line
		@@ -13,11 +13,71 @@ vnfd:
		vdu-profile:
		- id: simple_requires
		min-number-of-instances: 1
		vdu-configuration-id: simple_requires-vdu-configuration
		- id: simple_provides
		min-number-of-instances: 1
		vdu-configuration-id: simple_provides-vdu-configuration
		vnf-configuration-id: default-vnf-configuration
		lcm-operations-configuration:
		operate-vnf-op-config:
		day1-2:
		- id: vnf_relations-vnf
		relation:
		- entities:
		- endpoint: interface
		id: simple_provides
		- endpoint: interface
		id: simple_requires
		name: relation
		- config-access:
		ssh-access:
		default-user: ubuntu
		required: true
		config-primitive:
		- name: touch
		execution-environment-ref: simple-requires-ee
		parameter:
		- data-type: STRING
		default-value: /home/ubuntu/touched
		name: filename
		id: simple_requires
		execution-environment-list:
		- id: simple-requires-ee
		juju:
		charm: simple_requires
		proxy: false
		external-connection-point-ref: requires-mgmt-ext
		initial-config-primitive:
		- name: touch
		execution-environment-ref: simple-requires-ee
		parameter:
		- data-type: STRING
		name: filename
		value: /home/ubuntu/first-touch
		seq: 1
		- config-access:
		ssh-access:
		default-user: ubuntu
		required: true
		config-primitive:
		- name: touch
		execution-environment-ref: simple-provides-ee
		parameter:
		- data-type: STRING
		default-value: /home/ubuntu/touched
		name: filename
		id: simple_provides
		execution-environment-list:
		- id: simple-provides-ee
		juju:
		charm: simple_provides
		proxy: false
		external-connection-point-ref: provides-mgmt-ext
		initial-config-primitive:
		- name: touch
		execution-environment-ref: simple-provides-ee
		parameter:
		- data-type: STRING
		name: filename
		value: /home/ubuntu/first-touch
		seq: 1
		ext-cpd:
		- id: requires-mgmt-ext
		int-cpd:
		@@ -34,6 +94,14 @@ vnfd:
		- id: ubuntu18.04
		image: ubuntu18.04
		name: ubuntu18.04
		- id: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
		image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
		name: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
		vim-type: aws
		- id: ubuntu18.04-azure
		image: Canonical:UbuntuServer:18.04-LTS:18.04.201809110
		name: ubuntu18.04-azure
		vim-type: azure
		vdu:
		- cloud-init-file: cloud-config.txt
		id: simple_requires
		@@ -46,6 +114,9 @@ vnfd:
		type: PARAVIRT
		name: simple_requires
		sw-image-desc: ubuntu18.04
		alternative-sw-image-desc:
		- ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
		- ubuntu18.04-azure
		virtual-compute-desc: simple_requires-compute
		virtual-storage-desc:
		- simple_requires-storage
		@@ -63,49 +134,6 @@ vnfd:
		virtual-compute-desc: simple_provides-compute
		virtual-storage-desc:
		- simple_provides-storage
		vdu-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
		id: simple_requires-vdu-configuration
		initial-config-primitive:
		- name: touch
		parameter:
		- data-type: STRING
		name: filename
		value: /home/ubuntu/first-touch
		seq: 1
		juju:
		charm: simple_requires
		proxy: false
		- config-access:
		ssh-access:
		default-user: ubuntu
		required: true
		config-primitive:
		- name: touch
		parameter:
		- data-type: STRING
		default-value: /home/ubuntu/touched
		name: filename
		id: simple_provides-vdu-configuration
		initial-config-primitive:
		- name: touch
		parameter:
		- data-type: STRING
		name: filename
		value: /home/ubuntu/first-touch
		seq: 1
		juju:
		charm: simple_provides
		proxy: false
		version: 1.0
		virtual-compute-desc:
		- id: simple_requires-compute
		@@ -123,12 +151,3 @@ vnfd:
		size-of-storage: 10
		- id: simple_provides-storage
		size-of-storage: 10
		vnf-configuration:
		- id: default-vnf-configuration
		relation:
		- entities:
		- endpoint: interface
		id: simple_provides
		- endpoint: interface
		id: simple_requires
		name: relation