Test: add vsrx; disable tenant dhcp
Change-Id: I3bba947a7ea680dbfac30102dbdd3443b3353d0f
diff --git a/tcp_tests/templates/_heat_environments/eu-cloud.env b/tcp_tests/templates/_heat_environments/eu-cloud.env
index 6d5b71d..5b3b03b 100644
--- a/tcp_tests/templates/_heat_environments/eu-cloud.env
+++ b/tcp_tests/templates/_heat_environments/eu-cloud.env
@@ -7,6 +7,7 @@
"MCP::Networks": fragments/Networks.yaml
"MCP::SingleInstance": fragments/Instance.yaml
"MCP::FoundationNode": fragments/FoundationNode.yaml
+ "MCP::VsrxNode": fragments/VsrxNode.yaml
parameter_defaults:
@@ -30,6 +31,7 @@
gtw_flavor: system.compact.openstack.gateway
kvm_fake_flavor: system.virtual.fake_kvm
foundation_flavor: system.virtual.foundation
+ vsrx_flavor: oc_vsrx
key_pair: system_key_8133
diff --git a/tcp_tests/templates/_heat_environments/fragments/VsrxNode.yaml b/tcp_tests/templates/_heat_environments/fragments/VsrxNode.yaml
new file mode 100644
index 0000000..b3b32ef
--- /dev/null
+++ b/tcp_tests/templates/_heat_environments/fragments/VsrxNode.yaml
@@ -0,0 +1,96 @@
+heat_template_version: queens
+
+description: Single server instance fragment
+
+parameters:
+ network:
+ type: string
+ instance_flavor:
+ type: string
+ instance_image:
+ type: string
+ instance_name:
+ type: string
+ instance_config_host:
+ type: string
+ key_pair:
+ type: string
+ instance_domain:
+ type: string
+ net_public:
+ type: string
+ control_net_static_ip:
+ type: string
+ tenant_net_static_ip:
+ type: string
+ external_net_static_ip:
+ type: string
+ # underlay_userdata:
+ # type: string
+ env_name:
+ type: string
+ mcp_version:
+ type: string
+
+resources:
+ instance_port01:
+ type: OS::Neutron::Port
+ properties:
+ port_security_enabled: false
+ network_id: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
+ fixed_ips:
+ - ip_address: { get_param: control_net_static_ip }
+ instance_port02:
+ type: OS::Neutron::Port
+ properties:
+ port_security_enabled: false
+ network_id: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
+ fixed_ips:
+ - ip_address: { get_param: tenant_net_static_ip }
+ instance_port03:
+ type: OS::Neutron::Port
+ properties:
+ port_security_enabled: false
+ network_id: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
+ fixed_ips:
+ - ip_address: { get_param: external_net_static_ip }
+ instance_port04:
+ type: OS::Neutron::Port
+ properties:
+ port_security_enabled: false
+ network_id: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
+
+ instance_instance:
+ type: OS::Nova::Server
+ properties:
+ image_update_policy: REBUILD
+ flavor: { get_param: instance_flavor }
+ image: { get_param: instance_image }
+ key_name: { get_param: key_pair }
+ name:
+ list_join:
+ - '.'
+ - [ { get_param: instance_name }, { get_param: env_name } ]
+ networks:
+ - port: { get_resource: instance_port01 }
+ - port: { get_resource: instance_port02 }
+ - port: { get_resource: instance_port03 }
+ - port: { get_resource: instance_port04 }
+ metadata:
+ roles:
+ - vsrx_node
+
+outputs:
+
+ instance_address:
+ value:
+ get_attr:
+ - instance_instance
+ - addresses
+ - 'management_net'
+ - 0
+ - addr
+ description: "Instance's private IP address"
+ instance:
+ value: { get_resource: instance_instance }
+ description: "Instance"
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 763bda5..fc56b80 100644
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -232,7 +232,7 @@
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
- tenant_network_gateway: ==IPV4_NET_TENANT_PREFIX==.1
+ tenant_network_gateway: ==IPV4_NET_TENANT_PREFIX==.220
tenant_network_netmask: 255.255.255.0
tenant_network_subnet: ==IPV4_NET_TENANT_PREFIX==.0/24
upstream_proxy_enabled: 'False'
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
index f3f0e12..d9a8971 100644
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
@@ -60,7 +60,8 @@
type: string
foundation_flavor:
type: string
-
+ vsrx_flavor:
+ type: string
net_public:
type: string
@@ -508,6 +509,31 @@
- [ { get_attr: [networks, control_net_prefix] }, '5' ]
instance_config_host: { get_attr: [cfg01_node, instance_address] }
+ vsrx_node:
+ type: MCP::VsrxNode
+ depends_on: [cfg01_node]
+ properties:
+ env_name: { get_param: env_name }
+ mcp_version: { get_param: mcp_version }
+ instance_domain: {get_param: instance_domain}
+ instance_name: vsrx
+ instance_flavor: {get_param: vsrx_flavor}
+ instance_image: system_vsrx-12.1X46-D20.5
+ network: { get_attr: [networks, network] }
+ control_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [networks, control_net_prefix] }, '220' ]
+ tenant_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [networks, tenant_net_prefix] }, '220' ]
+ external_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [networks, external_net_prefix] }, '220' ]
+ instance_config_host: { get_attr: [cfg01_node, instance_address] }
+
outputs:
control_subnet_cidr: