diff --git a/rally/existing.json b/rally/existing.json
new file mode 100644
index 0000000..887c064
--- /dev/null
+++ b/rally/existing.json
@@ -0,0 +1,19 @@
+{
+    "creds": {
+        "openstack": {
+            "admin": {
+                "password": "myadminpass",
+                "tenant_name": "demo",
+                "username": "admin"
+            },
+            "auth_url": "http://example.net:5000/v2.0/",
+            "endpoint": null,
+            "endpoint_type": "public",
+            "https_cacert": "",
+            "https_insecure": false,
+            "profiler_hmac_key": null,
+            "region_name": "RegionOne"
+        }
+    },
+    "type": "ExistingCloud"
+}
diff --git a/rally/scenario.yaml b/rally/scenario.yaml
new file mode 100644
index 0000000..9720d7d
--- /dev/null
+++ b/rally/scenario.yaml
@@ -0,0 +1,16 @@
+---
+  GlanceImages.list_images:
+    - 
+      runner:
+        type: "constant"
+        times: {{iterations}}
+        concurrency: {{number_of_concurrent_scenarios}}
+      context:
+        users:
+          tenants: {{number_of_tenants}}
+          users_per_tenant: {{users_per_tenant}}
+        images:
+          image_url: {{glance_image_location}}
+          image_type: "qcow2"
+          image_container: "bare"
+          images_per_tenant: {{glance_images_per_tenant_before_benchmarking}}
diff --git a/rally/task_arguments.yaml b/rally/task_arguments.yaml
new file mode 100644
index 0000000..a597545
--- /dev/null
+++ b/rally/task_arguments.yaml
@@ -0,0 +1,73 @@
+---
+# Please, carefully review the list of variables and update their values.
+
+  image_name: "TestVM"
+  flavor_name: "m1.tiny"
+  availability_zone: nova
+  neutron_floating_network: "admin_floating_net" # str, external network for floating IP creation
+  nova_rebuild_to_image_name: "TestVM"
+  nova_rebuild_to_flavor_name: "m1.small"
+  block_migration: true
+  volume_type: "volumes_lvm"
+
+#============================
+# The variables below should not be changed if you are doing base line testing. Please, change it for customer specific tests only.
+
+# Conditions of an execution:
+  number_of_concurrent_scenarios: 1 # how many scenarios will be run at the same time
+  iterations: 1
+  users_per_tenant: 1
+  number_of_tenants: 1
+  sla_failure_rate_max: 0 # benchmark scenario will not be successful if more than 0% iterations failed
+
+# Parameters for Authenticate
+  number_of_times_to_validate: 1 # to ensure validation of token
+
+# Parameters for Cinder, size in GB
+  cinder_volume_size: 1
+  cinder_volume_size_before_benchmarking: 1 #  will be executed before scenario iteration starts
+  cinder_volume_min_size: 1
+  cinder_volume_max_size: 5
+  cinder_allow_snapshot: false # when set to True, allows snapshot of a volume when the volume is attached to an instance
+  cinder_allow_upload: false # when set to True volume that is attached to an instance could be uploaded to image
+  cinder_detailed_info: true # true if detailed information should be listed
+  cinder_read_only_volume: true # The value to indicate whether to update volume to read-only access mode
+  cinder_volume_min_extend_size: 6
+  cinder_volume_max_extend_size: 10
+  cinder_nested_cloning_level: 5 # argument for nested cloning volume to new volume or snapshot to anew one
+  cinder_quotas_params: { snapshots: -1, volumes: -1}
+
+# Parameters for Glance
+  glance_image_location: "https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-i386-disk.img"
+  glance_number_nova_servers_to_boot: 2
+  glance_images_per_tenant_before_benchmarking: 4
+
+# Parameters for Heat
+  stack_change_by_delta: 1 # the number of instances the stack is expected to change by
+  stacks_per_tenant_before_benchmarking: 2 # Stack generator allows to generate arbitrary number of stacks for each tenant before test scenarios.
+  resources_per_stack_before_benchmarking: 10 # defines number of resources that will be created inside each stack
+  # After test execution the stacks will be automatically removed from heat
+  num_instances_in_stack: 2
+
+# Parameters for Swift
+  swift_objects_per_container: 5 # number of objects to upload
+  swift_containers_per_tenant: 2 # will be executed before benchmarking
+
+# Parameters for Cinder, Nova
+  servers_per_tenant_before_benchmarking: 2
+  do_delete: true  # if True, a snapshot and a volume will be deleted after creation, deletes image and volume after uploading if True
+
+# Parameters for Nova
+  force_delete: false # True if force_delete should be used
+  nova_confirm_resize: true # True if need to confirm resize else revert resize
+  nova_number_of_instances_to_boot: 2
+  nova_security_group_count: 5
+  nova_rules_per_security_group: 10
+  nova_detailed_info: True
+  flavor_specification: {"ram": 500, "vcpus": 1, "disk": 1, "extra_specs": { "quota:disk_read_bytes_sec": 10240 } }
+  nova_secgroup_quota: { security_group: -1, security_group_rule: -1 }
+
+# Parameters for Neutron (-1 means unlimited)
+  neutron_quotas_params: { floatingip: -1, network: -1, subnet: -1, port: -1, router: -1, security_group: -1 }
+  neutron_ports_per_network: 10
+  neutron_subnets_per_network: 2
diff --git a/tempest/skip-list.yaml b/tempest/skip-list.yaml
new file mode 100644
index 0000000..5cdec8b
--- /dev/null
+++ b/tempest/skip-list.yaml
@@ -0,0 +1,52 @@
+tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_delete_when_peer_group_deleted[id-fc5c5acf-2091-43a6-a6ae-e42760e9ffaf,network]: Contrail specific problem. See https://bugs.launchpad.net/opencontrail/+bug/1591976.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_list_agent[id-9c80f04d-11f3-44a4-8738-ed2f879b0ff4]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_list_agents_non_admin[id-e335be47-b9a1-46fd-be30-0874c0b751e6]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_show_agent[id-869bc8e8-0fda-4a30-9b71-f8a7cf58ca9f]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_update_agent_description[id-68a94a14-1243-46e6-83bf-157627e31556]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_update_agent_status[id-371dfc5b-55b9-4cb5-ac82-c40eadaac941]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_external_network_extension.ExternalNetworksTestJSON.test_delete_external_networks_with_floating_ip[id-82068503-2cf2-4ed4-b3be-ecb89432e4bb]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1528979.
+tempest.api.network.admin.test_external_networks_negative.ExternalNetworksAdminNegativeTestJSON.test_create_port_with_precreated_floatingip_as_fixed_ip[id-d402ae6c-0be0-4d8e-833b-a738895d98d0,negative]: Contrail specific problem. See https://bugs.launchpad.net/opencontrail/+bug/1488447.
+tempest.api.network.test_allowed_address_pair.AllowedAddressPairIpV6TestJSON.test_create_list_port_with_address_pair[id-86c3529b-1231-40de-803c-00e40882f043]: See https://bugs.launchpad.net/juniperopenstack/+bug/1529317.
+tempest.api.network.test_allowed_address_pair.AllowedAddressPairIpV6TestJSON.test_update_port_with_address_pair[id-9599b337-272c-47fd-b3cf-509414414ac4]: See https://bugs.launchpad.net/juniperopenstack/+bug/1529317.
+tempest.api.network.test_allowed_address_pair.AllowedAddressPairIpV6TestJSON.test_update_port_with_cidr_address_pair[id-4d6d178f-34f6-4bff-a01c-0a2f8fe909e4]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1514778.
+tempest.api.network.test_allowed_address_pair.AllowedAddressPairIpV6TestJSON.test_update_port_with_multiple_ip_mac_address_pair[id-b3f20091-6cd5-472b-8487-3516137df933]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1529317.
+tempest.api.network.test_allowed_address_pair.AllowedAddressPairTestJSON.test_update_port_with_cidr_address_pair[id-4d6d178f-34f6-4bff-a01c-0a2f8fe909e4]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1514778.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcp_stateful_fixedips_outrange[id-98244d88-d990-4570-91d4-6b25d70d08af]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604556.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_64_subnets[id-4256c61d-c538-41ea-9147-3c450c36669e]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604564.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_invalid_options[id-81f18ef6-95b5-4584-9966-10d480b7496a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604568.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_stateless_eui64[id-e5517e62-6f16-430d-a672-f80875493d4c]: Contrail specific problem.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_stateless_no_ra[id-ae2f4a5d-03ff-4c42-a3b0-ce2fcb7ea832]: Contrail specific problem.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_two_subnets[id-4544adf7-bb5f-4bdc-b769-b3e77026cef2]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1596917.
+tempest.api.network.test_floating_ips_negative.FloatingIPNegativeTestJSON.test_associate_floatingip_port_ext_net_unreachable[id-6b3b8797-6d43-4191-985c-c48b773eb429,negative]: Contrail specific problem. https://bugs.launchpad.net/juniperopenstack/+bug/1476935.
+tempest.api.network.test_floating_ips_negative.FloatingIPNegativeTestJSON.test_create_floatingip_with_port_ext_net_unreachable[id-22996ea8-4a81-4b27-b6e1-fa5df92fa5e8,negative]: Contrail specific problem. https://bugs.launchpad.net/juniperopenstack/+bug/1476935.
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_slaac_subnet_with_ports[id-88554555-ebf8-41ef-9300-4926d45e06e9]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654177
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_stateless_subnet_with_ports[id-2de6ab5a-fcf0-4144-9813-f91a940291f1]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654177
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_subnet_with_v6_attributes_slaac[id-176b030f-a923-4040-a755-9dc94329e60c]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654179.
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_subnet_with_v6_attributes_stateful[id-da40cd1b-a833-4354-9a85-cd9b8a3b74ca]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654179.
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_subnet_with_v6_attributes_stateless[id-7d410310-8c86-4902-adf9-865d08e31adb]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654179.
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_list_subnet_with_no_gw64_one_network[id-a9653883-b2a4-469b-8c3c-4518430a7e55]: See https://bugs.launchpad.net/juniperopenstack/+bug/1514689.
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_update_subnet_gw_dns_host_routes_dhcp[id-3d3852eb-3009-49ec-97ac-5ce83b73010a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1476951.
+tempest.api.network.test_networks.NetworksIpV6Test.test_create_list_subnet_with_no_gw64_one_network[id-a9653883-b2a4-469b-8c3c-4518430a7e55]: See https://bugs.launchpad.net/juniperopenstack/+bug/1514689.
+tempest.api.network.test_networks.NetworksIpV6Test.test_create_update_network_description[id-c72c1c0c-2193-4aca-ccc4-b1442640bbbb]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1685940
+tempest.api.network.test_networks.NetworksIpV6Test.test_update_subnet_gw_dns_host_routes_dhcp[id-3d3852eb-3009-49ec-97ac-5ce83b73010a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1476951.
+tempest.api.network.test_networks.NetworksTest.test_create_update_network_description[id-c72c1c0c-2193-4aca-ccc4-b1442640bbbb]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1685940
+tempest.api.network.test_networks.NetworksTest.test_update_subnet_gw_dns_host_routes_dhcp[id-3d3852eb-3009-49ec-97ac-5ce83b73010a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1476951.
+tempest.api.network.test_ports.PortsAdminExtendedAttrsIpV6TestJSON.test_show_port_binding_ext_attr[id-b54ac0ff-35fc-4c79-9ca3-c7dbd4ea4f13]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1352221.
+tempest.api.network.test_ports.PortsAdminExtendedAttrsTestJSON.test_show_port_binding_ext_attr[id-b54ac0ff-35fc-4c79-9ca3-c7dbd4ea4f13]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1352221.
+tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_port_with_second_ip[id-63aeadd4-3b49-427f-a3b1-19ca81f06270]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604772.
+tempest.api.network.test_ports.PortsIpV6TestJSON.test_update_port_with_security_group_and_extra_attributes[id-58091b66-4ff4-4cc1-a549-05d60c7acd1a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
+tempest.api.network.test_ports.PortsIpV6TestJSON.test_update_port_with_two_security_groups_and_extra_attributes[id-edf6766d-3d40-4621-bc6e-2521a44c257d]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
+tempest.api.network.test_ports.PortsTestJSON.test_create_update_port_with_second_ip[id-63aeadd4-3b49-427f-a3b1-19ca81f06270]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604772.
+tempest.api.network.test_ports.PortsTestJSON.test_update_port_with_security_group_and_extra_attributes[id-58091b66-4ff4-4cc1-a549-05d60c7acd1a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
+tempest.api.network.test_ports.PortsTestJSON.test_update_port_with_two_security_groups_and_extra_attributes[id-edf6766d-3d40-4621-bc6e-2521a44c257d]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
+tempest.api.network.test_security_groups_negative.NegativeSecGroupIPv6Test.test_create_security_group_rule_wrong_ip_prefix_version[id-7607439c-af73-499e-bf64-f687fd12a842,negative]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604935.
+tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops[compute,id-f323b3ba-82f8-4db7-8ea6-6a895869ec49,network,smoke]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1330903.
+tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_port_security_macspoofing_port[compute,id-7c0bb1a2-d053-49a4-98f9-ca1a1d849f63,network]: Contrail specific problem.
+tempest.scenario.test_network_v6.TestGettingAddress.test_dhcp6_stateless_from_os[compute,id-d7e1f858-187c-45a6-89c9-bdafde619a9f,network,slow]: Contrail specific problem.
+tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_dhcp6_stateless_from_os[compute,id-76f26acd-9688-42b4-bc3e-cd134c4cb09e,network,slow]: Contrail specific problem.
+tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_dhcpv6_stateless[compute,id-cf1c4425-766b-45b8-be35-e2959728eb00,network]: Contrail specific problem.
+tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_slaac_from_os[compute,id-b6399d76-4438-4658-bcf5-0d6c8584fde2,network,slow]: Contrail specific problem.
+tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_dhcpv6_stateless[compute,id-7ab23f41-833b-4a16-a7c9-5b42fe6d4123,network,slow]: Contrail specific problem.
+tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_slaac[compute,id-dec222b1-180c-4098-b8c5-cc1b8342d611,network,slow]: Contrail specific problem.
+tempest.scenario.test_network_v6.TestGettingAddress.test_slaac_from_os[compute,id-2c92df61-29f0-4eaa-bee3-7c65bef62a43,network,slow]: Contrail specific problem.
+tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_port_security_disable_security_group[compute,id-7c811dcc-263b-49a3-92d2-1b4d8405f50c,network]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1632961.
diff --git a/tempest/tempest.conf b/tempest/tempest.conf
new file mode 100644
index 0000000..4178c6f
--- /dev/null
+++ b/tempest/tempest.conf
@@ -0,0 +1,84 @@
+[DEFAULT]
+debug = True
+use_stderr = False
+log_file =
+
+[auth]
+use_dynamic_credentials = True
+admin_username = admin
+admin_password = kwpOShwMRUQq25L3
+admin_project_name = admin
+admin_domain_name = Default
+
+[compute]
+image_ref =
+image_ref_alt =
+flavor_ref =
+flavor_ref_alt =
+fixed_network_name =
+
+[compute-feature-enabled]
+live_migration = False
+resize = True
+vnc_console = True
+attach_encrypted_volume = False
+
+[data-processing]
+
+[identity]
+region = RegionOne
+auth_version = v2
+uri =
+uri_v3 =
+disable_ssl_certificate_validation = False
+ca_certificates_file =
+
+[image-feature-enabled]
+deactivate_image = True
+
+[input-scenario]
+ssh_user_regex = [["^.*[Cc]irros.*$", "cirros"], ["^.*[Tt]est[VvMm].*$", "cirros"], ["^.*rally_verify.*$", "cirros"]]
+
+[network]
+public_network_id =
+floating_network_name =
+
+[network-feature-enabled]
+ipv6_subnet_attributes = True
+ipv6 = True
+api_extensions = contrail,ipam,security-group,network-ip-availability,timestamp_core,auto-allocated-topology,port-security,binding,provider,agent,quotas,route-table,tag,rbac-policies,external-net,policy,router,allowed-address-pairs,extra_dhcp_opt,standard-attr-description
+
+[object-storage]
+operator_role = Member
+reseller_admin_role = ResellerAdmin
+
+[oslo_concurrency]
+lock_path =
+
+[orchestration]
+instance_type =
+stack_owner_role = heat_stack_owner
+stack_user_role = heat_stack_user
+
+[scenario]
+img_dir =
+img_file =
+
+[service_available]
+cinder = True
+glance = True
+heat = True
+ironic = False
+neutron = True
+nova = True
+sahara = False
+swift = False
+
+[validation]
+run_validation = True
+image_ssh_user = cirros
+connect_method = floating
+
+[volume-feature-enabled]
+bootable = True
+