Repo structure modification

- create functest subdirectory
- rename unit tests
- adapt path in exec and config files

JIRA: FUNCTEST-525

Change-Id: Ifd5c6edfb5bda1b09f82848e2269ad5fbeb84d0a
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>

12 files changed, 0 insertions, 255 deletions

diff --git a/testcases/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template b/testcases/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template
deleted file mode 100644
index a22487e33..000000000
--- a/testcases/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template
+++ /dev/null
@@ -1,17 +0,0 @@
-heat_template_version: 2013-05-23
-
-resources:
-  test_group:
-    type: OS::Heat::AutoScalingGroup
-    properties:
-      desired_capacity: 0
-      max_size: 0
-      min_size: 0
-      resource:
-        type: OS::Heat::RandomString
-  test_policy:
-    type: OS::Heat::ScalingPolicy
-    properties:
-      adjustment_type: change_in_capacity
-      auto_scaling_group_id: { get_resource: test_group }
-      scaling_adjustment: 1
\ No newline at end of file
diff --git a/testcases/OpenStack/rally/scenario/templates/default.yaml.template b/testcases/OpenStack/rally/scenario/templates/default.yaml.template
deleted file mode 100644
index eb4f2f2dd..000000000
--- a/testcases/OpenStack/rally/scenario/templates/default.yaml.template
+++ /dev/null
@@ -1 +0,0 @@
-heat_template_version: 2014-10-16
\ No newline at end of file
diff --git a/testcases/OpenStack/rally/scenario/templates/random_strings.yaml.template b/testcases/OpenStack/rally/scenario/templates/random_strings.yaml.template
deleted file mode 100644
index 2dd676c11..000000000
--- a/testcases/OpenStack/rally/scenario/templates/random_strings.yaml.template
+++ /dev/null
@@ -1,13 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: Test template for rally create-update-delete scenario
-
-resources:
-  test_string_one:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
-  test_string_two:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
\ No newline at end of file
diff --git a/testcases/OpenStack/rally/scenario/templates/resource_group.yaml.template b/testcases/OpenStack/rally/scenario/templates/resource_group.yaml.template
deleted file mode 100644
index b3f505fa6..000000000
--- a/testcases/OpenStack/rally/scenario/templates/resource_group.yaml.template
+++ /dev/null
@@ -1,13 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: Test template for rally create-update-delete scenario
-
-resources:
-  test_group:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: 2
-      resource_def:
-        type: OS::Heat::RandomString
-        properties:
-          length: 20
\ No newline at end of file
diff --git a/testcases/OpenStack/rally/scenario/templates/server_with_ports.yaml.template b/testcases/OpenStack/rally/scenario/templates/server_with_ports.yaml.template
deleted file mode 100644
index 909f45d21..000000000
--- a/testcases/OpenStack/rally/scenario/templates/server_with_ports.yaml.template
+++ /dev/null
@@ -1,64 +0,0 @@
-heat_template_version: 2013-05-23
-
-parameters:
-  # set all correct defaults for parameters before launch test
-  public_net:
-    type: string
-    default: public
-  image:
-    type: string
-    default: cirros-0.3.4-x86_64-uec
-  flavor:
-    type: string
-    default: m1.tiny
-  cidr:
-    type: string
-    default: 11.11.11.0/24
-
-resources:
-  server:
-    type: OS::Nova::Server
-    properties:
-      image: {get_param: image}
-      flavor: {get_param: flavor}
-      networks:
-        - port: { get_resource: server_port }
-
-  router:
-    type: OS::Neutron::Router
-    properties:
-      external_gateway_info:
-        network: {get_param: public_net}
-
-  router_interface:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router_id: { get_resource: router }
-      subnet_id: { get_resource: private_subnet }
-
-  private_net:
-    type: OS::Neutron::Net
-
-  private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network: { get_resource: private_net }
-      cidr: {get_param: cidr}
-
-  port_security_group:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: default_port_security_group
-      description: >
-        Default security group assigned to port. The neutron default group is not
-        used because neutron creates several groups with the same name=default and
-        nova cannot chooses which one should it use.
-
-  server_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_resource: private_net}
-      fixed_ips:
-        - subnet: { get_resource: private_subnet }
-      security_groups:
-        - { get_resource: port_security_group }
diff --git a/testcases/OpenStack/rally/scenario/templates/server_with_volume.yaml.template b/testcases/OpenStack/rally/scenario/templates/server_with_volume.yaml.template
deleted file mode 100644
index 826ca9dae..000000000
--- a/testcases/OpenStack/rally/scenario/templates/server_with_volume.yaml.template
+++ /dev/null
@@ -1,43 +0,0 @@
-heat_template_version: 2013-05-23
-
-parameters:
-  # set all correct defaults for parameters before launch test
-  image:
-    type: string
-    default: cirros-0.3.4-x86_64-uec
-  flavor:
-    type: string
-    default: m1.tiny
-  availability_zone:
-    type: string
-    description: The Availability Zone to launch the instance.
-    default: nova
-  volume_size:
-    type: number
-    description: Size of the volume to be created.
-    default: 1
-    constraints:
-      - range: { min: 1, max: 1024 }
-        description: must be between 1 and 1024 Gb.
-  network_id:
-    type: string
-
-resources:
-  server:
-    type: OS::Nova::Server
-    properties:
-      image: {get_param: image}
-      flavor: {get_param: flavor}
-      networks:
-        - network: { get_param: network_id }
-  cinder_volume:
-    type: OS::Cinder::Volume
-    properties:
-      size: { get_param: volume_size }
-      availability_zone: { get_param: availability_zone }
-  volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_resource: cinder_volume }
-      instance_uuid: { get_resource: server}
-      mountpoint: /dev/vdc
diff --git a/testcases/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template b/testcases/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
deleted file mode 100644
index cf34879ca..000000000
--- a/testcases/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
+++ /dev/null
@@ -1,23 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template updates resource parameters without resource re-creation(replacement)
-  in the stack defined by autoscaling_policy.yaml.template. It allows to measure
-  performance of "pure" resource update operation only.
-
-resources:
-  test_group:
-    type: OS::Heat::AutoScalingGroup
-    properties:
-      desired_capacity: 0
-      max_size: 0
-      min_size: 0
-      resource:
-        type: OS::Heat::RandomString
-  test_policy:
-    type: OS::Heat::ScalingPolicy
-    properties:
-      adjustment_type: change_in_capacity
-      auto_scaling_group_id: { get_resource: test_group }
-      scaling_adjustment: -1
\ No newline at end of file
diff --git a/testcases/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template b/testcases/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template
deleted file mode 100644
index e06d42e01..000000000
--- a/testcases/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template
+++ /dev/null
@@ -1,19 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template updates the stack defined by random_strings.yaml.template with additional resource.
-
-resources:
-  test_string_one:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
-  test_string_two:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
-  test_string_three:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
\ No newline at end of file
diff --git a/testcases/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template b/testcases/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template
deleted file mode 100644
index d02593e3b..000000000
--- a/testcases/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template
+++ /dev/null
@@ -1,11 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template deletes one resource from the stack defined by random_strings.yaml.template.
-
-resources:
-  test_string_one:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
\ No newline at end of file
diff --git a/testcases/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template b/testcases/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template
deleted file mode 100644
index 46d8bff4c..000000000
--- a/testcases/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template
+++ /dev/null
@@ -1,19 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template deletes one resource from the stack defined by
-  random_strings.yaml.template and re-creates it with the updated parameters
-  (so-called update-replace). That happens because some parameters cannot be
-  changed without resource re-creation. The template allows to measure performance
-  of update-replace operation.
-
-resources:
-  test_string_one:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
-  test_string_two:
-    type: OS::Heat::RandomString
-    properties:
-      length: 40
\ No newline at end of file
diff --git a/testcases/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template b/testcases/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template
deleted file mode 100644
index 891074ebc..000000000
--- a/testcases/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template
+++ /dev/null
@@ -1,16 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template updates one resource from the stack defined by resource_group.yaml.template
-  and adds children resources to that resource.
-
-resources:
-  test_group:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: 3
-      resource_def:
-        type: OS::Heat::RandomString
-        properties:
-          length: 20
\ No newline at end of file
diff --git a/testcases/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template b/testcases/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
deleted file mode 100644
index b4d1d1730..000000000
--- a/testcases/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
+++ /dev/null
@@ -1,16 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template updates one resource from the stack defined by resource_group.yaml.template
-  and deletes children resources from that resource.
-
-resources:
-  test_group:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: 1
-      resource_def:
-        type: OS::Heat::RandomString
-        properties:
-          length: 20
\ No newline at end of file