Fix pike,queens contrail models
Add 'secrets_encryption_enabled' and 'openstack_keystone_security'
Fix vsrx for bm and heat envs
Add valid public and tempest network for tests
Remove kvm4-6
Change-Id: I4a1632b77f95d5197deb5970a3200606910a5e74
diff --git a/tcp_tests/managers/runtestmanager.py b/tcp_tests/managers/runtestmanager.py
index e5b00e8..348dea6 100644
--- a/tcp_tests/managers/runtestmanager.py
+++ b/tcp_tests/managers/runtestmanager.py
@@ -159,7 +159,7 @@
if contrail_integration:
vsrx_router = self.__salt_api.get_single_pillar(
tgt="I@opencontrail:control:role:primary",
- pillar="_param:opencontrail_router01_address")
+ pillar="_param:opencontrail_router02_address")
public_network = "192.168.200.0"
contrail_commands = [
{
@@ -168,6 +168,12 @@
'cmd': ("set -ex; ip route replace " +
public_network + "/24 via " + vsrx_router)},
{
+ 'description': "Iptables for public",
+ 'node_name': self.target_name,
+ 'cmd': ("set -ex; iptables -t nat -A POSTROUTING -s " +
+ public_network + "/24 ! -d " + public_network +
+ "/24 -j MASQUERADE")},
+ {
'description': "Align security group: remove all rules",
'node_name': self.target_name,
'cmd': ("set -ex;" +
@@ -210,15 +216,21 @@
public_network + "\",\"ip_prefix_len\":24," +
"\"asn\":64512,\"target\":10000}'")},
{
- 'description': "Create heat network",
+ 'description': "Run skiped in pipelines neutron.client",
'node_name': self.target_name,
'cmd': ("set -ex;" +
- "salt -C 'I@opencontrail:control:role:primary' " +
- "contrail.virtual_network_create heat-net " +
- "'{\"external\":false,\"ip_prefix\":\"" +
- "10.20.30.0\",\"ip_prefix_len\":24}'")},
+ "salt -C 'I@neutron:client and cfg*' " +
+ "state.sls neutron.client|true")},
]
- commands = contrail_commands + commands
+ post_contrail_commands = [
+ {
+ 'description': "Delete admin role",
+ 'node_name': self.target_name,
+ 'cmd': ("set -ex;" +
+ "sed -i 's/tempest_roles = admin//g' " +
+ TEMPEST_CFG_DIR + "/tempest.conf")},
+ ]
+ commands = contrail_commands + commands + post_contrail_commands
if barbican_integration:
commands.append({