Restructured QTIP directories and CLI

I have changed the arguments for the CLI and now QTIP
takes a file along withthe name of the lab to run on
Right now only the config files for the dell lab have
been added, These will increase when we make QTIP available
for other labs. I have also added the provision of changing
the public network from the config file and some leftover
files from previous verisons have been remove

Change-Id: Ifeb01d80099eab06dc77a7b2e07097ebb17a13a2
Signed-off-by: Mofassir Arif <Mofassir_arif@dellteam.com>

18 files changed, 3 insertions, 150 deletions

diff --git a/test_cases/SampleHeat.yaml b/test_cases/SampleHeat.yaml
deleted file mode 100644
index 95b9a137..00000000
--- a/test_cases/SampleHeat.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-  heat_template_version: 2014-10-16
-
-  description: Test10
-  
-  parameters:
-
-    public_network:
-      type: string
-      label: Public Network name or ID
-      description: Public network with floating IPs
-      default: "provider_network"
-
-    private_net_name:
-      type: string
-      default: "private_network"
-  
-    flavor:
-      type: string
-      label: Flavor
-      default: m1.large
-
-    image:
-      type: string
-      label: Image name
-      default: CentOS
-    
-    availability_zone:
-      type: string
-      description: The Availability Zone to launch the instance.
-      default: compute1
-  
-  resources:
-
-    private_network:
-      type: OS::Neutron::Net
-      
-
-    private_subnet:
-      type: OS::Neutron::Subnet
-      properties:
-        network_id: { get_resource: private_network }
-        cidr: 10.10.17.0/24
-        dns_nameservers:
-          - 8.8.8.8
-    
-    router_1:
-      type: OS::Neutron::Router
-      properties:
-        external_gateway_info:
-          network: { get_param: public_network  }
-
-    router_interface:
-      type: OS::Neutron::RouterInterface
-      properties:
-        router_id: { get_resource: router_1 } 
-        subnet: { get_resource: private_subnet }
-
-    public_port:
-      type: OS::Neutron::Port
-      properties:
-        network: { get_resource: private_network }
-        security_groups: [{ get_resource: demo1_security_Group }]
-
-    floating_ip:
-      type: OS::Neutron::FloatingIP
-      properties:
-        floating_network: { get_param: public_network }
-     
-    floating_ip_assoc:
-      type: OS::Neutron::FloatingIPAssociation
-      properties:
-       floatingip_id: { get_resource: floating_ip }
-       port_id: { get_resource: public_port }
-
-    demo1_security_Group:
-      type: OS::Neutron::SecurityGroup
-      properties:
-        name: demo1_security_Group
-        rules:
-          - protocol: tcp
-            port_range_min: 22
-            port_range_max: 22
-          - protocol: icmp    
-  
-    my_instance:
-      type: OS::Nova::Server
-      properties:
-        image: { get_param: image}
-        flavor: { get_param: flavor}
-        availability_zone: { get_param: availability_zone }
-        networks:
-          - port: { get_resource: public_port }
-        
-
-
-  outputs:
-   instance_ip:
-     description: IP address of the instance
-     value: { get_attr: [floating_ip, floating_ip_address] }
-   
-
-
-
diff --git a/test_cases/TESTER.yaml b/test_cases/TESTER.yaml
deleted file mode 100644
index 5a3f2d33..00000000
--- a/test_cases/TESTER.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-Scenario:
-  benchmark: dpi
-  host: virtualmachine_1
-  server: virtualmachine_2
-  pointless:
-Context:
-  Host_Machines:
-
-
-  Virtual_Machines:
-     virtualmachine_1:
-      availability_zone: nova
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: iiihost
-      flavor: m1.large
-     virtualmachine_2:
-      availability_zone: nova
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: server
-      flavor: m1.large
-
-Test_Description:
-  Test_category: "Compute"
-  Benchmark: "dpi"
-  Overview: >
-        '''This test will run the DPI benchmark in serial on virutalmachine_1 and virtualmachine_2.\n
-         if you wish to add a host machine add the following information under the Host_Machine tag
-
-        machine_1:
-          ip:
-          pw:
-          role:
-          '''
- 
diff --git a/test_cases/compute/.whetstone_serial.yaml.swp b/test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp
index bbfd3be2..bbfd3be2 100644
--- a/test_cases/compute/.whetstone_serial.yaml.swp
+++ b/test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp
diff --git a/test_cases/compute/dhrystone_parallel.yaml b/test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml
index 29de6d6f..29de6d6f 100644
--- a/test_cases/compute/dhrystone_parallel.yaml
+++ b/test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml
diff --git a/test_cases/compute/dhrystone_serial.yaml b/test_cases/dell_santa_clara/compute/dhrystone_serial.yaml
index e15e8ecc..e15e8ecc 100644
--- a/test_cases/compute/dhrystone_serial.yaml
+++ b/test_cases/dell_santa_clara/compute/dhrystone_serial.yaml
diff --git a/test_cases/compute/dpi_parallel.yaml b/test_cases/dell_santa_clara/compute/dpi_parallel.yaml
index 01905f57..0f6afdce 100644
--- a/test_cases/compute/dpi_parallel.yaml
+++ b/test_cases/dell_santa_clara/compute/dpi_parallel.yaml
@@ -11,16 +11,16 @@ Context:
      virtualmachine_1:
       availability_zone: compute1
       OS_image: QTIP_CentOS
-      public_network: 'provider_network'
+      public_network: 'net04_ext'
       role: 1Run
       flavor: m1.large
      virtualmachine_2:
       availability_zone: compute4
       OS_image: QTIP_CentOS
-      public_network: 'provider_network'
+      public_network: 'net04_ext'
       role: 1Run
       flavor: m1.large
-    
+
 Test_Description:
   Test_category: "Compute"
   Benchmark: "dpi"
diff --git a/test_cases/compute/dpi_serial.yaml b/test_cases/dell_santa_clara/compute/dpi_serial.yaml
index e8f34627..b39597a2 100644
--- a/test_cases/compute/dpi_serial.yaml
+++ b/test_cases/dell_santa_clara/compute/dpi_serial.yaml
@@ -25,14 +25,6 @@ Test_Description:
          OS_image: QTIP_CentOS
          public_network: 'provider_network'
 
-          Virtual_Machines:
-             virtualmachine_1:
-              availability_zone: compute1
-              OS_image: QTIP_CentOS
-              public_network: 'provider_network'
-              role: 2host
-              flavor: m1.large
-
          role: 1host
          flavor: m1.large
         machine_1:
diff --git a/test_cases/compute/ssl_parallel.yaml b/test_cases/dell_santa_clara/compute/ssl_parallel.yaml
index eb46d8d8..eb46d8d8 100644
--- a/test_cases/compute/ssl_parallel.yaml
+++ b/test_cases/dell_santa_clara/compute/ssl_parallel.yaml
diff --git a/test_cases/compute/ssl_serial.yaml b/test_cases/dell_santa_clara/compute/ssl_serial.yaml
index 756951bf..756951bf 100644
--- a/test_cases/compute/ssl_serial.yaml
+++ b/test_cases/dell_santa_clara/compute/ssl_serial.yaml
diff --git a/test_cases/compute/whetstone_parallel.yaml b/test_cases/dell_santa_clara/compute/whetstone_parallel.yaml
index 48bc7230..48bc7230 100644
--- a/test_cases/compute/whetstone_parallel.yaml
+++ b/test_cases/dell_santa_clara/compute/whetstone_parallel.yaml
diff --git a/test_cases/compute/whetstone_serial.yaml b/test_cases/dell_santa_clara/compute/whetstone_serial.yaml
index 25cefbf8..25cefbf8 100644
--- a/test_cases/compute/whetstone_serial.yaml
+++ b/test_cases/dell_santa_clara/compute/whetstone_serial.yaml
diff --git a/test_cases/network/iperf_topology_1.yaml b/test_cases/dell_santa_clara/network/iperf_topology_1.yaml
index 20a433a9..20a433a9 100644
--- a/test_cases/network/iperf_topology_1.yaml
+++ b/test_cases/dell_santa_clara/network/iperf_topology_1.yaml
diff --git a/test_cases/network/iperf_topology_2.yaml b/test_cases/dell_santa_clara/network/iperf_topology_2.yaml
index 4392f32b..4392f32b 100644
--- a/test_cases/network/iperf_topology_2.yaml
+++ b/test_cases/dell_santa_clara/network/iperf_topology_2.yaml
diff --git a/test_cases/network/iperf_topology_3.yaml b/test_cases/dell_santa_clara/network/iperf_topology_3.yaml
index 9e7b73e7..9e7b73e7 100644
--- a/test_cases/network/iperf_topology_3.yaml
+++ b/test_cases/dell_santa_clara/network/iperf_topology_3.yaml
diff --git a/test_cases/network/netperf.yaml b/test_cases/dell_santa_clara/network/netperf.yaml
index 60ee4a13..60ee4a13 100644
--- a/test_cases/network/netperf.yaml
+++ b/test_cases/dell_santa_clara/network/netperf.yaml
diff --git a/test_cases/network/pktgen.yaml b/test_cases/dell_santa_clara/network/pktgen.yaml
index 13fae68f..13fae68f 100644
--- a/test_cases/network/pktgen.yaml
+++ b/test_cases/dell_santa_clara/network/pktgen.yaml
diff --git a/test_cases/storage/fio_2.yaml b/test_cases/dell_santa_clara/storage/fio_2.yaml
index 46368cd2..46368cd2 100644
--- a/test_cases/storage/fio_2.yaml
+++ b/test_cases/dell_santa_clara/storage/fio_2.yaml
diff --git a/test_cases/storage/fio_parallel.yaml b/test_cases/dell_santa_clara/storage/fio_parallel.yaml
index e058af24..e058af24 100644
--- a/test_cases/storage/fio_parallel.yaml
+++ b/test_cases/dell_santa_clara/storage/fio_parallel.yaml