Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update INFO.yaml with new PTL
[demo.git]
/
tosca
/
vCPE
/
infra
/
MainServiceTemplate.yaml
diff --git
a/tosca/vCPE/infra/MainServiceTemplate.yaml
b/tosca/vCPE/infra/MainServiceTemplate.yaml
index
728cb21
..
0a3b178
100644
(file)
--- a/
tosca/vCPE/infra/MainServiceTemplate.yaml
+++ b/
tosca/vCPE/infra/MainServiceTemplate.yaml
@@
-3,6
+3,7
@@
metadata:
template_name: vCPE_infra
template_version: "1.0"
template_author: onap
template_name: vCPE_infra
template_version: "1.0"
template_author: onap
+ VNFD_SCHEMA_VERSION: "2.5.1+1"
description: vCPE_infra
imports:
description: vCPE_infra
imports:
@@
-45,16
+46,16
@@
topology_template:
default: 10.0.11.1
mr_ip_port:
type: string
default: 10.0.11.1
mr_ip_port:
type: string
- description: IP port of the Message Router that for vDHCP configuration
+ description: IP port of the Message Router that for vDHCP configuration
default: "3904"
dcae_collector_ip:
type: string
description: dcae collector ip
default: 10.0.4.102
dcae_collector_port:
default: "3904"
dcae_collector_ip:
type: string
description: dcae collector ip
default: 10.0.4.102
dcae_collector_port:
- type:
integer
+ type:
string
description: dcae collector port
description: dcae collector port
- default:
8080
+ default:
"8080"
nexus_artifact_repo:
type: string
description: Root URL for the Nexus repository for Maven artifacts
nexus_artifact_repo:
type: string
description: Root URL for the Nexus repository for Maven artifacts
@@
-167,79
+168,95
@@
topology_template:
# type: tosca.nodes.nfv.VnfVirtualLink
# properties:
# connectivity_type:
# type: tosca.nodes.nfv.VnfVirtualLink
# properties:
# connectivity_type:
-# layer_protocol
: ipv4
+# layer_protocol
s: [ipv4]
# vl_profile:
# vl_profile:
-# max_bit
_
rate_requirements:
+# max_bitrate_requirements:
# root: 10000000
# leaf: 10000000
# root: 10000000
# leaf: 10000000
-# min_bit
_
rate_requirements:
+# min_bitrate_requirements:
# root: 10000000
# leaf: 10000000
# root: 10000000
# leaf: 10000000
-# networkName: { get_input: public_net_id }
+# virtual_link_protocol_data:
+# - associated_layer_protocol: ipv4
+# l3_protocol_data:
+# ip_version: ipv4
+# name: { get_input: public_net_id }
#
# #onap oam net
# VL_onap_private:
# type: tosca.nodes.nfv.VnfVirtualLink
# properties:
# connectivity_type:
#
# #onap oam net
# VL_onap_private:
# type: tosca.nodes.nfv.VnfVirtualLink
# properties:
# connectivity_type:
-# layer_protocol
: ipv4
+# layer_protocol
s: [ipv4]
# vl_profile:
# vl_profile:
-# max_bit
_
rate_requirements:
+# max_bitrate_requirements:
# root: 10000000
# leaf: 10000000
# root: 10000000
# leaf: 10000000
-# min_bit
_
rate_requirements:
+# min_bitrate_requirements:
# root: 10000000
# leaf: 10000000
# root: 10000000
# leaf: 10000000
-# networkName: { get_input: onap_private_net_id }
-# cidr: { get_input: onap_private_net_cidr }
+# virtual_link_protocol_data:
+# - associated_layer_protocol: ipv4
+# l3_protocol_data:
+# ip_version: ipv4
+# name: { get_input: onap_private_net_id }
+# cidr: { get_input: onap_private_net_cidr }
#cpe signal network
VL_cpe_signal:
type: tosca.nodes.nfv.VnfVirtualLink
properties:
connectivity_type:
#cpe signal network
VL_cpe_signal:
type: tosca.nodes.nfv.VnfVirtualLink
properties:
connectivity_type:
- layer_protocol
: ipv4
+ layer_protocol
s: [ipv4]
vl_profile:
vl_profile:
- max_bit
_
rate_requirements:
+ max_bitrate_requirements:
root: 10000000
leaf: 10000000
root: 10000000
leaf: 10000000
- min_bit
_
rate_requirements:
+ min_bitrate_requirements:
root: 10000000
leaf: 10000000
root: 10000000
leaf: 10000000
- networkName: { get_input: cpe_signal_net_id}
- cidr: { get_input: cpe_signal_net_cidr }
- dhcpEnabled: false
+ virtual_link_protocol_data:
+ - associated_layer_protocol: ipv4
+ l3_protocol_data:
+ ip_version: ipv4
+ name: { get_input: cpe_signal_net_id}
+ cidr: { get_input: cpe_signal_net_cidr }
+ dhcp_enabled: false
#cpe public network
VL_cpe_public:
type: tosca.nodes.nfv.VnfVirtualLink
properties:
connectivity_type:
#cpe public network
VL_cpe_public:
type: tosca.nodes.nfv.VnfVirtualLink
properties:
connectivity_type:
- layer_protocol
: ipv4
+ layer_protocol
s: [ipv4]
vl_profile:
vl_profile:
- max_bit
_
rate_requirements:
+ max_bitrate_requirements:
root: 10000000
leaf: 10000000
root: 10000000
leaf: 10000000
- min_bit
_
rate_requirements:
+ min_bitrate_requirements:
root: 10000000
leaf: 10000000
root: 10000000
leaf: 10000000
- networkName: { get_input: cpe_public_net_id}
- cidr: { get_input: cpe_public_net_cidr }
- dhcpEnabled: false
+ virtual_link_protocol_data:
+ - associated_layer_protocol: ipv4
+ l3_protocol_data:
+ ip_version: ipv4
+ name: { get_input: cpe_public_net_id}
+ cidr: { get_input: cpe_public_net_cidr }
+ dhcp_enabled: false
# vaaa related
Cp_vaaa_public:
type: tosca.nodes.nfv.VduCp
properties:
# vaaa related
Cp_vaaa_public:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocol
s
: [ipv4]
trunk_mode: false
trunk_mode: false
- protocol
_data
:
- - ass
c
ociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
+
-
address_type: ip_address
+
l3_address_data:
+
ip_address_assignment: false
+
floating_ip_activated: false
requirements:
- virtual_binding: VDU_vaaa_0
# - virtual_link: VL_public
requirements:
- virtual_binding: VDU_vaaa_0
# - virtual_link: VL_public
@@
-247,17
+264,17
@@
topology_template:
Cp_vaaa_onap_private:
type: tosca.nodes.nfv.VduCp
properties:
Cp_vaaa_onap_private:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocol
s
: [ipv4]
trunk_mode: false
trunk_mode: false
- protocol
_data
:
- - ass
c
ociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
- fixed_ip_address:
- - { get_input: vaaa_private_ip_1 }
+
-
address_type: ip_address
+
l3_address_data:
+
ip_address_assignment: false
+
floating_ip_activated: false
+
fixed_ip_address:
+
- { get_input: vaaa_private_ip_1 }
requirements:
- virtual_binding: VDU_vaaa_0
# - virtual_link: VL_onap_private
requirements:
- virtual_binding: VDU_vaaa_0
# - virtual_link: VL_onap_private
@@
-265,41
+282,32
@@
topology_template:
Cp_vaaa_cpe_signal:
type: tosca.nodes.nfv.VduCp
properties:
Cp_vaaa_cpe_signal:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocol
s
: [ipv4]
trunk_mode: false
trunk_mode: false
- protocol
_data
:
- - ass
c
ociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
- fixed_ip_address:
- - { get_input: vaaa_private_ip_0 }
+
-
address_type: ip_address
+
l3_address_data:
+
ip_address_assignment: false
+
floating_ip_activated: false
+
fixed_ip_address:
+
- { get_input: vaaa_private_ip_0 }
requirements:
- virtual_binding: VDU_vaaa_0
- virtual_link: VL_cpe_signal
requirements:
- virtual_binding: VDU_vaaa_0
- virtual_link: VL_cpe_signal
- VirtualStorage_root_all:
- # this indicate the VDU root storage size
- type: tosca.nodes.nfv.Vdu.VirtualStorage
- properties:
- type_of_storage: root
- size_of_storage: 40 GB
-
VDU_vaaa_0:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: { get_input: vaaa_name_0 }
description: vaaa
VDU_vaaa_0:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: { get_input: vaaa_name_0 }
description: vaaa
- configurable_properties:
- additional_vnfc_configurable_properties: {}
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
watchdog: none
inject_files: #TODO SDC Bug
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
watchdog: none
inject_files: #TODO SDC Bug
- source_path: ../Artifacts/Deployment/O
ther
/authorized_keys #SSH authorized_keys
+ source_path: ../Artifacts/Deployment/O
THER
/authorized_keys #SSH authorized_keys
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
@@
-314,7
+322,7
@@
topology_template:
install_script_version: { get_input: install_script_version }
cloud_env: { get_input: cloud_env }
nexus_artifact_repo: { get_input: nexus_artifact_repo }
install_script_version: { get_input: install_script_version }
cloud_env: { get_input: cloud_env }
nexus_artifact_repo: { get_input: nexus_artifact_repo }
-
user
_data: |
+
boot
_data: |
#!/bin/bash
METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
apt-get -y install jq
#!/bin/bash
METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
apt-get -y install jq
@@
-349,32
+357,31
@@
topology_template:
capabilities:
virtual_compute:
properties:
capabilities:
virtual_compute:
properties:
- #TODO add local disk size
virtual_memory:
virtual_mem_size: 4096 MB
virtual_cpu:
num_virtual_cpu: 2
virtual_memory:
virtual_mem_size: 4096 MB
virtual_cpu:
num_virtual_cpu: 2
-
requirements
:
- - virtual_storage: VirtualStorage_root_all
+
virtual_local_storage
:
+ - size_of_storage: 40 GB
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
- file: ../Artifacts/Deployment/O
ther
/image
+ file: ../Artifacts/Deployment/O
THER
/image
type: tosca.artifacts.nfv.SwImage
# vdns related
Cp_vdns_public:
type: tosca.nodes.nfv.VduCp
properties:
type: tosca.artifacts.nfv.SwImage
# vdns related
Cp_vdns_public:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocol
s
: [ipv4]
trunk_mode: false
trunk_mode: false
- protocol
_data
:
- - ass
c
ociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
+
-
address_type: ip_address
+
l3_address_data:
+
ip_address_assignment: false
+
floating_ip_activated: false
requirements:
- virtual_binding: VDU_vdns_0
# - virtual_link: VL_public
requirements:
- virtual_binding: VDU_vdns_0
# - virtual_link: VL_public
@@
-382,17
+389,17
@@
topology_template:
Cp_vdns_onap_private:
type: tosca.nodes.nfv.VduCp
properties:
Cp_vdns_onap_private:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocol
s
: [ipv4]
trunk_mode: false
trunk_mode: false
- protocol
_data
:
- - ass
c
ociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
- fixed_ip_address:
- - { get_input: vdns_private_ip_1 }
+
-
address_type: ip_address
+
l3_address_data:
+
ip_address_assignment: false
+
floating_ip_activated: false
+
fixed_ip_address:
+
- { get_input: vdns_private_ip_1 }
requirements:
- virtual_binding: VDU_vdns_0
#- virtual_link: VL_onap_private
requirements:
- virtual_binding: VDU_vdns_0
#- virtual_link: VL_onap_private
@@
-400,17
+407,17
@@
topology_template:
Cp_vdns_cpe_public:
type: tosca.nodes.nfv.VduCp
properties:
Cp_vdns_cpe_public:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocol
s
: [ipv4]
trunk_mode: false
trunk_mode: false
- protocol
_data
:
- - ass
c
ociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
- fixed_ip_address:
- - { get_input: vdns_private_ip_0 }
+
-
address_type: ip_address
+
l3_address_data:
+
ip_address_assignment: false
+
floating_ip_activated: false
+
fixed_ip_address:
+
- { get_input: vdns_private_ip_0 }
requirements:
- virtual_binding: VDU_vdns_0
- virtual_link: VL_cpe_public
requirements:
- virtual_binding: VDU_vdns_0
- virtual_link: VL_cpe_public
@@
-420,14
+427,12
@@
topology_template:
properties:
name: { get_input: vdns_name_0 }
description: vdns
properties:
name: { get_input: vdns_name_0 }
description: vdns
- configurable_properties:
- additional_vnfc_configurable_properties: {}
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
watchdog: none
inject_files: # TODO SDC Bug
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
watchdog: none
inject_files: # TODO SDC Bug
- source_path: ../Artifacts/Deployment/O
ther
/authorized_keys #SSH authorized_keys
+ source_path: ../Artifacts/Deployment/O
THER
/authorized_keys #SSH authorized_keys
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
@@
-440,7
+445,7
@@
topology_template:
install_script_version: { get_input: install_script_version }
cloud_env: { get_input: cloud_env }
nexus_artifact_repo: { get_input: nexus_artifact_repo }
install_script_version: { get_input: install_script_version }
cloud_env: { get_input: cloud_env }
nexus_artifact_repo: { get_input: nexus_artifact_repo }
-
user
_data: |
+
boot
_data: |
#!/bin/bash
METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
apt-get -y install jq
#!/bin/bash
METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
apt-get -y install jq
@@
-473,32
+478,31
@@
topology_template:
capabilities:
virtual_compute:
properties:
capabilities:
virtual_compute:
properties:
- #TODO add local disk size
virtual_memory:
virtual_mem_size: 4096 MB
virtual_cpu:
num_virtual_cpu: 2
virtual_memory:
virtual_mem_size: 4096 MB
virtual_cpu:
num_virtual_cpu: 2
-
requirements
:
- - virtual_storage: VirtualStorage_root_all
+
virtual_local_storage
:
+ - size_of_storage: 40 GB
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
- file: ../Artifacts/Deployment/O
ther
/image
+ file: ../Artifacts/Deployment/O
THER
/image
type: tosca.artifacts.nfv.SwImage
# vdhcp related
Cp_vdhcp_public:
type: tosca.nodes.nfv.VduCp
properties:
type: tosca.artifacts.nfv.SwImage
# vdhcp related
Cp_vdhcp_public:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocol
s
: [ipv4]
trunk_mode: false
trunk_mode: false
- protocol
_data
:
- - ass
c
ociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
+
-
address_type: ip_address
+
l3_address_data:
+
ip_address_assignment: false
+
floating_ip_activated: false
requirements:
- virtual_binding: VDU_vdhcp_0
# - virtual_link: VL_public
requirements:
- virtual_binding: VDU_vdhcp_0
# - virtual_link: VL_public
@@
-506,17
+510,17
@@
topology_template:
Cp_vdhcp_onap_private:
type: tosca.nodes.nfv.VduCp
properties:
Cp_vdhcp_onap_private:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocol
s
: [ipv4]
trunk_mode: false
trunk_mode: false
- protocol
_data
:
- - ass
c
ociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
- fixed_ip_address:
- - { get_input: vdhcp_private_ip_1 }
+
-
address_type: ip_address
+
l3_address_data:
+
ip_address_assignment: false
+
floating_ip_activated: false
+
fixed_ip_address:
+
- { get_input: vdhcp_private_ip_1 }
requirements:
- virtual_binding: VDU_vdhcp_0
# - virtual_link: VL_onap_private
requirements:
- virtual_binding: VDU_vdhcp_0
# - virtual_link: VL_onap_private
@@
-524,17
+528,17
@@
topology_template:
Cp_vdhcp_cpe_signal:
type: tosca.nodes.nfv.VduCp
properties:
Cp_vdhcp_cpe_signal:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocol
s
: [ipv4]
trunk_mode: false
trunk_mode: false
- protocol
_data
:
- - ass
c
ociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
- fixed_ip_address:
- - { get_input: vdhcp_private_ip_0 }
+
-
address_type: ip_address
+
l3_address_data:
+
ip_address_assignment: false
+
floating_ip_activated: false
+
fixed_ip_address:
+
- { get_input: vdhcp_private_ip_0 }
requirements:
- virtual_binding: VDU_vdhcp_0
- virtual_link: VL_cpe_signal
requirements:
- virtual_binding: VDU_vdhcp_0
- virtual_link: VL_cpe_signal
@@
-544,14
+548,12
@@
topology_template:
properties:
name: { get_input: vdhcp_name_0 }
description: vdhcp
properties:
name: { get_input: vdhcp_name_0 }
description: vdhcp
- configurable_properties:
- additional_vnfc_configurable_properties: {}
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
watchdog: none
inject_files: #SDC Bug
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
watchdog: none
inject_files: #SDC Bug
- source_path: ../Artifacts/Deployment/O
ther
/authorized_keys #SSH authorized_keys
+ source_path: ../Artifacts/Deployment/O
THER
/authorized_keys #SSH authorized_keys
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
@@
-566,7
+568,7
@@
topology_template:
install_script_version: { get_input: install_script_version }
cloud_env: { get_input: cloud_env }
nexus_artifact_repo: { get_input: nexus_artifact_repo }
install_script_version: { get_input: install_script_version }
cloud_env: { get_input: cloud_env }
nexus_artifact_repo: { get_input: nexus_artifact_repo }
-
user
_data: |
+
boot
_data: |
#!/bin/bash
METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
apt-get -y install jq
#!/bin/bash
METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
apt-get -y install jq
@@
-601,32
+603,31
@@
topology_template:
capabilities:
virtual_compute:
properties:
capabilities:
virtual_compute:
properties:
- #TODO add local disk size
virtual_memory:
virtual_mem_size: 4096 MB
virtual_cpu:
num_virtual_cpu: 2
virtual_memory:
virtual_mem_size: 4096 MB
virtual_cpu:
num_virtual_cpu: 2
-
requirements
:
- - virtual_storage: VirtualStorage_root_all
+
virtual_local_storage
:
+ - size_of_storage: 40 GB
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
- file: ../Artifacts/Deployment/O
ther
/image
+ file: ../Artifacts/Deployment/O
THER
/image
type: tosca.artifacts.nfv.SwImage
# vweb related
Cp_vweb_public:
type: tosca.nodes.nfv.VduCp
properties:
type: tosca.artifacts.nfv.SwImage
# vweb related
Cp_vweb_public:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocol
s
: [ipv4]
trunk_mode: false
trunk_mode: false
- protocol
_data
:
- - ass
c
ociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
+
-
address_type: ip_address
+
l3_address_data:
+
ip_address_assignment: false
+
floating_ip_activated: false
requirements:
- virtual_binding: VDU_vweb_0
# - virtual_link: VL_public
requirements:
- virtual_binding: VDU_vweb_0
# - virtual_link: VL_public
@@
-634,17
+635,17
@@
topology_template:
Cp_vweb_onap_private:
type: tosca.nodes.nfv.VduCp
properties:
Cp_vweb_onap_private:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocol
s
: [ipv4]
trunk_mode: false
trunk_mode: false
- protocol
_data
:
- - ass
c
ociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
- fixed_ip_address:
- - { get_input: vweb_private_ip_1 }
+
-
address_type: ip_address
+
l3_address_data:
+
ip_address_assignment: false
+
floating_ip_activated: false
+
fixed_ip_address:
+
- { get_input: vweb_private_ip_1 }
requirements:
- virtual_binding: VDU_vweb_0
# - virtual_link: VL_onap_private
requirements:
- virtual_binding: VDU_vweb_0
# - virtual_link: VL_onap_private
@@
-652,17
+653,17
@@
topology_template:
Cp_vweb_cpe_public:
type: tosca.nodes.nfv.VduCp
properties:
Cp_vweb_cpe_public:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocol
s
: [ipv4]
trunk_mode: false
trunk_mode: false
- protocol
_data
:
- - ass
c
ociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
- fixed_ip_address:
- - { get_input: vweb_private_ip_0 }
+
-
address_type: ip_address
+
l3_address_data:
+
ip_address_assignment: false
+
floating_ip_activated: false
+
fixed_ip_address:
+
- { get_input: vweb_private_ip_0 }
requirements:
- virtual_binding: VDU_vweb_0
- virtual_link: VL_cpe_public
requirements:
- virtual_binding: VDU_vweb_0
- virtual_link: VL_cpe_public
@@
-672,14
+673,12
@@
topology_template:
properties:
name: { get_input: vweb_name_0 }
description: vweb
properties:
name: { get_input: vweb_name_0 }
description: vweb
- configurable_properties:
- additional_vnfc_configurable_properties: {}
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
watchdog: none
inject_files: # TODO SDC bug
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
watchdog: none
inject_files: # TODO SDC bug
- source_path: ../Artifacts/Deployment/O
ther
/authorized_keys #SSH authorized_keys
+ source_path: ../Artifacts/Deployment/O
THER
/authorized_keys #SSH authorized_keys
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
@@
-692,7
+691,7
@@
topology_template:
install_script_version: { get_input: install_script_version }
cloud_env: { get_input: cloud_env }
nexus_artifact_repo: { get_input: nexus_artifact_repo }
install_script_version: { get_input: install_script_version }
cloud_env: { get_input: cloud_env }
nexus_artifact_repo: { get_input: nexus_artifact_repo }
-
user
_data: |
+
boot
_data: |
#!/bin/bash
METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
apt-get -y install jq
#!/bin/bash
METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
apt-get -y install jq
@@
-725,16
+724,14
@@
topology_template:
capabilities:
virtual_compute:
properties:
capabilities:
virtual_compute:
properties:
- #TODO add local disk size
virtual_memory:
virtual_mem_size: 4096 MB
virtual_cpu:
num_virtual_cpu: 2
virtual_memory:
virtual_mem_size: 4096 MB
virtual_cpu:
num_virtual_cpu: 2
-
requirements
:
- - virtual_storage: VirtualStorage_root_all
+
virtual_local_storage
:
+ - size_of_storage: 40 GB
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
- file: ../Artifacts/Deployment/O
ther
/image
+ file: ../Artifacts/Deployment/O
THER
/image
type: tosca.artifacts.nfv.SwImage
type: tosca.artifacts.nfv.SwImage
-