Add Security Rule to allow SSH and fix CSIT

Added a new custom security group called csit
Added rules in csit group to allow tcp ingress as well as egress
Split the create router as the first create fails a lot of time
bug reported: https://bugs.opendaylight.org/show_bug.cgi?id=6617

Change-Id: I1a671c5805c84ad72e4d5070cf15001688b96648
Signed-off-by: gvrangan <venkatrangang@hcl.com>

diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 0b0f718c85abc456b630d18447ed925828a5db74..00beaf56146d2ca088783ef55fc837df192cc3fd 100644 (file)
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -153,13 +153,13 @@ Get Port Id
     [Return]    ${port_id}
 
 Create Vm Instances
-    [Arguments]    ${net_name}    ${vm_instance_names}    ${image}=cirros-0.3.4-x86_64-uec    ${flavor}=m1.nano
+    [Arguments]    ${net_name}    ${vm_instance_names}    ${image}=cirros-0.3.4-x86_64-uec    ${flavor}=m1.nano      ${sg}=default
     [Documentation]    Create X Vm Instance with the net id of the Netowrk.
     ${devstack_conn_id}=    Get ControlNode Connection
     Switch Connection    ${devstack_conn_id}
     ${net_id}=    Get Net Id    ${net_name}    ${devstack_conn_id}
     : FOR    ${VmElement}    IN    @{vm_instance_names}
-    \    ${output}=    Write Commands Until Prompt    nova boot --image ${image} --flavor ${flavor} --nic net-id=${net_id} ${VmElement}    30s
+    \    ${output}=    Write Commands Until Prompt    nova boot --image ${image} --flavor ${flavor} --nic net-id=${net_id} ${VmElement} --security-groups ${sg}    30s
     \    Log    ${output}
     \    Wait Until Keyword Succeeds    25s    5s    Verify VM Is ACTIVE    ${VmElement}
 
@@ -377,3 +377,17 @@ Show Debugs
     \    ${output}=    Write Commands Until Prompt    nova show ${index}    30s
     \    Log    ${output}
     Close Connection
+
+Create Security Group
+    [Arguments]    ${sg_name}     ${desc}
+    ${devstack_conn_id}=    Get ControlNode Connection
+    Switch Connection    ${devstack_conn_id}
+    ${output}=    Write Commands Until Prompt    nova secgroup-create ${sg_name} ${desc}      40s
+    Close Connection
+
+Create Security Rule
+    [Arguments]    ${direction}     ${protocol}      ${min_port}     ${max_port}     ${remote_ip}     ${sg_name}
+    ${devstack_conn_id}=    Get ControlNode Connection
+    Switch Connection    ${devstack_conn_id}
+    ${output}=    Write Commands Until Prompt    neutron security-group-rule-create --direction ${direction} --protocol ${protocol} --port-range-min ${min_port} --port-range-max ${max_port} --remote-ip-prefix ${remote_ip} ${sg_name}
+    Close Connection

diff --git a/csit/suites/openstack/clustering/01_l2_tests.robot b/csit/suites/openstack/clustering/01_l2_tests.robot
index 20d9e771b5366218ddc10a3a2a9c6015bbf58652..b0db6482b8afb96f803053460fe8f4257c00d0dc 100644 (file)
--- a/csit/suites/openstack/clustering/01_l2_tests.robot
+++ b/csit/suites/openstack/clustering/01_l2_tests.robot
@@ -85,7 +85,7 @@ Delete the Bridge Manually and Verify After Fail
 Create Vm Instances For l2_net_1
     [Documentation]    Create Vm instances using flavor and image names for a network.
     Log    ${devstack_conn_id}
-    OpenStackOperations.Create Vm Instances    l2_net_1    ${NET_1_VM_INSTANCES}
+    OpenStackOperations.Create Vm Instances    l2_net_1    ${NET_1_VM_INSTANCES}     sg=csit
     [Teardown]    OpenStackOperations.Show Debugs    ${NET_1_VM_INSTANCES}
 
 Bring Up ODL1
@@ -110,7 +110,7 @@ Take Down ODL2
 
 Create Vm Instances For l2_net_2
     [Documentation]    Create Vm instances using flavor and image names for a network.
-    OpenStackOperations.Create Vm Instances    l2_net_2    ${NET_2_VM_INSTANCES}
+    OpenStackOperations.Create Vm Instances    l2_net_2    ${NET_2_VM_INSTANCES}      sg=csit
     [Teardown]    OpenStackOperations.Show Debugs    ${NET_2_VM_INSTANCES}
 
 Bring Up ODL2

diff --git a/csit/suites/openstack/clustering/02_l3_tests.robot b/csit/suites/openstack/clustering/02_l3_tests.robot
index 60929552bd2dcc29cd78075cebe3f501396dc53e..33d2dd797ad612debbf98384c023da78898cb33d 100644 (file)
--- a/csit/suites/openstack/clustering/02_l3_tests.robot
+++ b/csit/suites/openstack/clustering/02_l3_tests.robot
@@ -47,7 +47,7 @@ Take Down ODL1
 
 Create Vm Instances For l3_net_1
     [Documentation]    Create Four Vm instances using flavor and image names for a network.
-    OpenStackOperations.Create Vm Instances    l3_net_1    ${NET_1_VM_INSTANCES}
+    OpenStackOperations.Create Vm Instances    l3_net_1    ${NET_1_VM_INSTANCES}     sg=csit
     [Teardown]    OpenStackOperations.Show Debugs    ${NET_1_VM_INSTANCES}
 
 Bring Up ODL1
@@ -60,7 +60,7 @@ Take Down ODL2
 
 Create Vm Instances For l3_net_2
     [Documentation]    Create Four Vm instances using flavor and image names for a network.
-    OpenStackOperations.Create Vm Instances    l3_net_2    ${NET_2_VM_INSTANCES}
+    OpenStackOperations.Create Vm Instances    l3_net_2    ${NET_2_VM_INSTANCES}     sg=csit
     [Teardown]    Show Debugs    ${NET_2_VM_INSTANCES}
 
 Bring Up ODL2
@@ -71,9 +71,12 @@ Take Down ODL3
     [Documentation]    Kill the karaf in Third Controller
     ClusterManagement.Kill Single Member    3
 
-Create Routers
-    [Documentation]    Create Router and Add Interface to the subnets.
+Create Router router_2
+    [Documentation]    Create Router and Add Interface to the subnets. this fails sometimes.
     OpenStackOperations.Create Router    router_2
+
+Create Router router_3
+    [Documentation]    Create Router and Add Interface to the subnets.
     OpenStackOperations.Create Router    router_3
 
 Add Interfaces To Router

diff --git a/csit/suites/openstack/connectivity/01_l2_tests.robot b/csit/suites/openstack/connectivity/01_l2_tests.robot
index d98779b7afcedd862ee5eeea43b4b596ca76e3e9..c4dba2579146304bdc8e441b25b823d34e4866ff 100644 (file)
--- a/csit/suites/openstack/connectivity/01_l2_tests.robot
+++ b/csit/suites/openstack/connectivity/01_l2_tests.robot
@@ -36,14 +36,20 @@ Create Subnets For l2_network_2
     [Documentation]    Create Sub Nets for the Networks with neutron request.
     Create SubNet    l2_network_2    l2_subnet_2    @{SUBNETS_RANGE}[1]
 
+Add Ssh Allow Rule
+    [Documentation]    Allow all TCP packets for testing
+    Create Security Group      csit    "CSIT SSH Allow"
+    Create Security Rule     ingress      tcp     1     65535     0.0.0.0/0      csit
+    Create Security Rule     egress       tcp     1     65535     0.0.0.0/0      csit
+
 Create Vm Instances For l2_network_1
     [Documentation]    Create Four Vm instances using flavor and image names for a network.
-    Create Vm Instances    l2_network_1    ${NET_1_VM_INSTANCES}
+    Create Vm Instances    l2_network_1    ${NET_1_VM_INSTANCES}     sg=csit
     [Teardown]    Show Debugs    ${NET_1_VM_INSTANCES}
 
 Create Vm Instances For l2_network_2
     [Documentation]    Create Four Vm instances using flavor and image names for a network.
-    Create Vm Instances    l2_network_2    ${NET_2_VM_INSTANCES}
+    Create Vm Instances    l2_network_2    ${NET_2_VM_INSTANCES}     sg=csit
     [Teardown]    Show Debugs    ${NET_2_VM_INSTANCES}
     Get OvsDebugInfo
 

diff --git a/csit/suites/openstack/connectivity/02_l3_tests.robot b/csit/suites/openstack/connectivity/02_l3_tests.robot
index ab48df20895f2593a6ad9eb8649dafeb9b914631..36342c7d6b0573587dcf148676f2e7da9b9d9acd 100644 (file)
--- a/csit/suites/openstack/connectivity/02_l3_tests.robot
+++ b/csit/suites/openstack/connectivity/02_l3_tests.robot
@@ -37,12 +37,12 @@ Create Subnets For network_2
 
 Create Vm Instances For network_1
     [Documentation]    Create Four Vm instances using flavor and image names for a network.
-    Create Vm Instances    network_1    ${NET_1_VM_INSTANCES}
+    Create Vm Instances    network_1    ${NET_1_VM_INSTANCES}    sg=csit
     [Teardown]    Show Debugs    ${NET_1_VM_INSTANCES}
 
 Create Vm Instances For network_2
     [Documentation]    Create Four Vm instances using flavor and image names for a network.
-    Create Vm Instances    network_2    ${NET_2_VM_INSTANCES}
+    Create Vm Instances    network_2    ${NET_2_VM_INSTANCES}    sg=csit
     [Teardown]    Show Debugs    ${NET_2_VM_INSTANCES}
 
 Create Routers