Merge branch 'feat/new_configuration_container' into 'master' (779d08eb) · Commits · vnf-onboarding / OSM Packages

charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml

+38 −33

Original line number	Diff line number	Diff line
		@@ -15,7 +15,43 @@ 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:
		- id: ha_proxy_charm-vnf
		execution-environment-list:
		- id: simple-ee
		juju:
		charm: simple
		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
		initial-config-primitive:
		- name: config
		execution-environment-ref: simple-ee
		parameter:
		- name: ssh-hostname
		value: <rw_mgmt_ip>
		- name: ssh-username
		value: ubuntu
		- name: ssh-password
		value: osm4u
		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:
		@@ -50,7 +86,6 @@ vnfd:
		virtual-compute-desc: mgmtVM-compute
		virtual-storage-desc:
		- mgmtVM-storage

		virtual-compute-desc:
		- id: mgmtVM-compute
		virtual-cpu:
		@@ -60,33 +95,3 @@ vnfd:
		virtual-storage-desc:
		- id: mgmtVM-storage
		size-of-storage: "10"
		vnf-configuration:
		- 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:
		- name: config
		parameter:
		- name: ssh-hostname
		value: <rw_mgmt_ip>
		- name: ssh-username
		value: ubuntu
		- name: ssh-password
		value: osm4u
		seq: 1
		- name: touch
		parameter:
		- data-type: STRING
		name: filename
		value: /home/ubuntu/first-touch
		seq: 2
		juju:
		charm: simple

charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml

+39 −33

Original line number	Diff line number	Diff line
		@@ -11,7 +11,44 @@ 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-primitive:
		- name: touch
		execution-environment-ref: simple-ee
		parameter:
		- data-type: STRING
		default-value: /home/ubuntu/touched
		name: filename
		config-access:
		ssh-access:
		default-user: ubuntu
		required: true
		execution-environment-list:
		- id: simple-ee
		juju:
		charm: simple
		cloud: k8s
		id: k8s_proxy_charm-vnf
		initial-config-primitive:
		- name: config
		execution-environment-ref: simple-ee
		parameter:
		- name: ssh-hostname
		value: <rw_mgmt_ip>
		- name: ssh-username
		value: ubuntu
		- name: ssh-password
		value: osm4u
		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:
		@@ -59,34 +96,3 @@ vnfd:
		virtual-storage-desc:
		- id: mgmtVM-storage
		size-of-storage: 10
		vnf-configuration:
		- 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:
		- name: config
		parameter:
		- name: ssh-hostname
		value: <rw_mgmt_ip>
		- name: ssh-username
		value: ubuntu
		- name: ssh-password
		value: osm4u
		seq: 1
		- name: touch
		parameter:
		- data-type: STRING
		name: filename
		value: /home/ubuntu/first-touch
		seq: 2
		juju:
		charm: simple
		cloud: k8s

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:
		@@ -49,28 +76,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/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml

+23 −20

Original line number	Diff line number	Diff line
		vnfd:
		df:
		- id: default-df
		ext-cpd:
		- id: mgmt-ext
		k8s-cluster-net: mgmtnet
		id: native_k8s_charm-vnf
		k8s-cluster:
		nets:
		- id: mgmtnet
		kdu:
		- name: native-kdu
		juju-bundle: bundle.yaml
		kdu-configuration:
		lcm-operations-configuration:
		operate-vnf-op-config:
		day1-2:
		- id: native-kdu
		config-primitive:
		- name: changecontent
		parameter:
		@@ -31,5 +24,15 @@ vnfd:
		name: customtitle
		value: Initial Config Primitive
		seq: 1
		ext-cpd:
		- id: mgmt-ext
		k8s-cluster-net: mgmtnet
		id: native_k8s_charm-vnf
		k8s-cluster:
		nets:
		- id: mgmtnet
		kdu:
		- name: native-kdu
		juju-bundle: bundle.yaml
		mgmt-cp: mgmt-ext
		product-name: native_k8s_charm-vnf

charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml

+36 −30

Original line number	Diff line number	Diff line
		@@ -11,7 +11,42 @@ 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_k8s_proxy_charm-vnf
		execution-environment-list:
		- id: simple-ee
		juju:
		charm: simple
		cloud: k8s
		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:
		@@ -59,32 +94,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
		cloud: k8s