Updates to K8s related scripts and fixes to scenarios
Related-PROD: PROD-36128
Change-Id: I098f97cb063229848679669ca881f3c2f09129e9
diff --git a/k8s/_init_pod.sh b/k8s/_init_pod.sh
index 9c30e9d..996880a 100644
--- a/k8s/_init_pod.sh
+++ b/k8s/_init_pod.sh
@@ -2,7 +2,7 @@
cd /artifacts
# Installing prerequisites
apt -y update
-apt -y install python3-pip vim git iperf3 mtr htop
+apt -y install python3-pip vim git iperf3 mtr htop iputils-ping traceroute tcpdump
pip3 install rally-openstack python-neutronclient pyghmi
# Prepare Rally
diff --git a/k8s/k8s-mos-scenarios.yaml b/k8s/k8s-mos-scn-i1.yaml
similarity index 100%
rename from k8s/k8s-mos-scenarios.yaml
rename to k8s/k8s-mos-scn-i1.yaml
diff --git a/k8s/k8s-mos-scenarios-100.yaml b/k8s/k8s-mos-scn-i100.yaml
similarity index 100%
rename from k8s/k8s-mos-scenarios-100.yaml
rename to k8s/k8s-mos-scn-i100.yaml
diff --git a/k8s/openstack-mos-scn-i1.json b/k8s/openstack-mos-scn-i1.json
new file mode 100644
index 0000000..cac67f4
--- /dev/null
+++ b/k8s/openstack-mos-scn-i1.json
@@ -0,0 +1,454 @@
+{% set flavor_name = flavor_name or "cvp.tiny" %}
+{% set image_name = image_name or "cvp.cirros.35" %}
+{% set availability_zone = "nova" %}
+{% set concurrency = 1 %}
+{% set volume_size = 1 %}
+{% set times = 1 %}
+{% set users = 1 %}
+{% set tenants = 1 %}
+{% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
+{% set heat_template = "/artifacts/res-files/rally/default.yaml.template" %}
+{% set fixed_net = "id" %}
+
+{
+ "KeystoneBasic.authenticate_user_and_validate_token": [
+ {
+ "args": {},
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "KeystoneBasic.create_tenant_with_users": [
+ {
+ "args": { "users_per_tenant": 10 },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "Authenticate.validate_cinder": [
+ {
+ "args": { "repetitions": 2 },
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "context": {
+ "users": {
+ "users_per_tenant": {{users}},
+ "tenants": {{tenants}}
+ },
+ "api_versions@openstack": { "cinder": {"service_type": "volumev3"} }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "Authenticate.validate_glance": [
+ {
+ "args": { "repetitions": 2 },
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "context": {
+ "users": {
+ "users_per_tenant": {{users}},
+ "tenants": {{tenants}}
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "Authenticate.validate_heat": [
+ {
+ "args": { "repetitions": 2 },
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "context": {
+ "users": {
+ "users_per_tenant": {{users}},
+ "tenants": {{tenants}}
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "Authenticate.validate_nova": [
+ {
+ "args": { "repetitions": 2 },
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "context": {
+ "users": {
+ "users_per_tenant": {{users}},
+ "tenants": {{tenants}}
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "Authenticate.validate_neutron": [
+ {
+ "args": { "repetitions": 2 },
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "context": {
+ "users": {
+ "users_per_tenant": {{users}},
+ "tenants": {{tenants}}
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "NovaServers.boot_and_migrate_server": [
+ {
+ "args": {
+ "flavor": {
+ "name": "{{flavor_name}}"
+ },
+ "image": {
+ "name": "{{image_name}}"
+ },
+ "nics": [
+ {"net-id": "{{fixed_net}}"}
+ ]
+ },
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "context": {
+ "users": {
+ "users_per_tenant": {{users}},
+ "tenants": {{tenants}}
+ },
+ "quotas": {
+ "nova": {
+ "instances": -1,
+ "cores": -1,
+ "ram": -1,
+ "key_pairs": -1,
+ "security_groups": -1,
+ "security_group_rules": -1
+ }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "NovaServers.boot_and_delete_server": [
+ {
+ "args": {
+ "flavor": {
+ "name": "{{flavor_name}}"
+ },
+ "image": {
+ "name": "{{image_name}}"
+ },
+ "nics": [
+ {"net-id": "{{fixed_net}}"}
+ ],
+ "detailed": true,
+ "availability_zone": "{{availability_zone}}"
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "quotas": {
+ "nova": {
+ "instances": -1,
+ "cores": -1,
+ "ram": -1,
+ "key_pairs": -1,
+ "security_groups": -1,
+ "security_group_rules": -1
+ }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "NovaServers.boot_server_from_volume_and_delete": [
+ {
+ "args": {
+ "flavor": {
+ "name": "{{flavor_name}}"
+ },
+ "image": {
+ "name": "{{image_name}}"
+ },
+ "nics": [
+ {"net-id": "{{fixed_net}}"}
+ ],
+ "volume_size": {{volume_size}},
+ "force_delete": false,
+ "availability_zone": "{{availability_zone}}"
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "api_versions@openstack": { "cinder": {"service_type": "volumev3"} },
+ "quotas": {
+ "nova": {
+ "instances": -1,
+ "cores": -1,
+ "ram": -1,
+ "key_pairs": -1,
+ "security_groups": -1,
+ "security_group_rules": -1
+ },
+ "cinder": { "volumes": -1 }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "NeutronNetworks.create_and_delete_networks": [
+ {
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "quotas": {
+ "neutron": { "network": -1 }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "NeutronNetworks.create_and_delete_ports": [
+ {
+ "args": {
+ "network_create_args": {},
+ "port_create_args": {},
+ "ports_per_network": 10
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "quotas": {
+ "neutron": {
+ "network": -1,
+ "port": -1
+ }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "NeutronNetworks.create_and_delete_routers": [
+ {
+ "args": {
+ "network_create_args": {},
+ "subnet_create_args": {},
+ "subnet_cidr_start": "1.1.0.0/30",
+ "subnets_per_network": 2,
+ "router_create_args": {}
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "quotas": {
+ "neutron": {
+ "network": -1,
+ "subnet": -1,
+ "router": -1
+ }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "CinderVolumes.create_and_attach_volume": [
+ {
+ "args": {
+ "size": {{volume_size}},
+ "image": {
+ "name": "{{image_name}}"
+ },
+ "flavor": {
+ "name": "{{flavor_name}}"
+ },
+ "nics": [
+ {"net-id": "{{fixed_net}}"}
+ ],
+ "create_volume_params": {},
+ "availability_zone": "{{availability_zone}}"
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "api_versions@openstack": { "cinder": {"service_type": "volumev3"} },
+ "quotas": {
+ "nova": {
+ "instances": -1,
+ "cores": -1,
+ "ram": -1,
+ "key_pairs": -1,
+ "security_groups": -1,
+ "security_group_rules": -1
+ },
+ "cinder": { "volumes": -1 }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "CinderVolumes.create_and_delete_snapshot": [
+ {
+ "args": { "force": false },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "volumes": { "size": {{volume_size}} },
+ "quotas": {
+ "cinder": {
+ "snapshots": -1,
+ "volumes": -1
+ }
+ },
+ "api_versions@openstack": { "cinder": {"service_type": "volumev3"} }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "CinderVolumes.create_and_upload_volume_to_image": [
+ {
+ "args": {
+ "size": {{volume_size}},
+ "force": false,
+ "container_format": "bare",
+ "disk_format": "raw",
+ "do_delete": true,
+ "image": {
+ "name": "{{image_name}}"
+ }
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "quotas": {
+ "cinder": {
+ "snapshots": -1,
+ "volumes": -1
+ }
+ },
+ "api_versions@openstack": { "cinder": {"service_type": "volumev3"} }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "GlanceImages.create_and_delete_image": [
+ {
+ "args": {
+ "image_location": "{{rbd_image}}",
+ "container_format": "bare",
+ "disk_format": "qcow2"
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "HeatStacks.create_and_delete_stack": [
+ {
+ "args": { "template_path": "{{heat_template}}" },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ]
+}
diff --git a/k8s/openstack-mos-scn-i100.json b/k8s/openstack-mos-scn-i100.json
new file mode 100644
index 0000000..58eb219
--- /dev/null
+++ b/k8s/openstack-mos-scn-i100.json
@@ -0,0 +1,455 @@
+{% set concurrency = 10 %}
+{% set volume_size = 1 %}
+{% set times = 100 %}
+{% set users = 3 %}
+{% set tenants = 3 %}
+
+{% set flavor_name = flavor_name or "cvp.tiny" %}
+{% set image_name = image_name or "cvp.cirros.35" %}
+{% set availability_zone = "nova" %}
+{% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
+{% set heat_template = "/artifacts/res-files/rally/default.yaml.template" %}
+{% set fixed_net = "id" %}
+
+{
+ "KeystoneBasic.authenticate_user_and_validate_token": [
+ {
+ "args": {},
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "KeystoneBasic.create_tenant_with_users": [
+ {
+ "args": { "users_per_tenant": 10 },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "Authenticate.validate_cinder": [
+ {
+ "args": { "repetitions": 2 },
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "context": {
+ "users": {
+ "users_per_tenant": {{users}},
+ "tenants": {{tenants}}
+ },
+ "api_versions@openstack": { "cinder": {"service_type": "volumev3"} }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "Authenticate.validate_glance": [
+ {
+ "args": { "repetitions": 2 },
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "context": {
+ "users": {
+ "users_per_tenant": {{users}},
+ "tenants": {{tenants}}
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "Authenticate.validate_heat": [
+ {
+ "args": { "repetitions": 2 },
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "context": {
+ "users": {
+ "users_per_tenant": {{users}},
+ "tenants": {{tenants}}
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "Authenticate.validate_nova": [
+ {
+ "args": { "repetitions": 2 },
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "context": {
+ "users": {
+ "users_per_tenant": {{users}},
+ "tenants": {{tenants}}
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "Authenticate.validate_neutron": [
+ {
+ "args": { "repetitions": 2 },
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "context": {
+ "users": {
+ "users_per_tenant": {{users}},
+ "tenants": {{tenants}}
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "NovaServers.boot_and_migrate_server": [
+ {
+ "args": {
+ "flavor": {
+ "name": "{{flavor_name}}"
+ },
+ "image": {
+ "name": "{{image_name}}"
+ },
+ "nics": [
+ {"net-id": "{{fixed_net}}"}
+ ]
+ },
+ "runner": {
+ "type": "constant",
+ "times": {{times}},
+ "concurrency": {{concurrency}}
+ },
+ "context": {
+ "users": {
+ "users_per_tenant": {{users}},
+ "tenants": {{tenants}}
+ },
+ "quotas": {
+ "nova": {
+ "instances": -1,
+ "cores": -1,
+ "ram": -1,
+ "key_pairs": -1,
+ "security_groups": -1,
+ "security_group_rules": -1
+ }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "NovaServers.boot_and_delete_server": [
+ {
+ "args": {
+ "flavor": {
+ "name": "{{flavor_name}}"
+ },
+ "image": {
+ "name": "{{image_name}}"
+ },
+ "nics": [
+ {"net-id": "{{fixed_net}}"}
+ ],
+ "detailed": true,
+ "availability_zone": "{{availability_zone}}"
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "quotas": {
+ "nova": {
+ "instances": -1,
+ "cores": -1,
+ "ram": -1,
+ "key_pairs": -1,
+ "security_groups": -1,
+ "security_group_rules": -1
+ }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "NovaServers.boot_server_from_volume_and_delete": [
+ {
+ "args": {
+ "flavor": {
+ "name": "{{flavor_name}}"
+ },
+ "image": {
+ "name": "{{image_name}}"
+ },
+ "nics": [
+ {"net-id": "{{fixed_net}}"}
+ ],
+ "volume_size": {{volume_size}},
+ "force_delete": false,
+ "availability_zone": "{{availability_zone}}"
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "api_versions@openstack": { "cinder": {"service_type": "volumev3"} },
+ "quotas": {
+ "nova": {
+ "instances": -1,
+ "cores": -1,
+ "ram": -1,
+ "key_pairs": -1,
+ "security_groups": -1,
+ "security_group_rules": -1
+ },
+ "cinder": { "volumes": -1 }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "NeutronNetworks.create_and_delete_networks": [
+ {
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "quotas": {
+ "neutron": { "network": -1 }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "NeutronNetworks.create_and_delete_ports": [
+ {
+ "args": {
+ "network_create_args": {},
+ "port_create_args": {},
+ "ports_per_network": 10
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "quotas": {
+ "neutron": {
+ "network": -1,
+ "port": -1
+ }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "NeutronNetworks.create_and_delete_routers": [
+ {
+ "args": {
+ "network_create_args": {},
+ "subnet_create_args": {},
+ "subnet_cidr_start": "1.1.0.0/30",
+ "subnets_per_network": 2,
+ "router_create_args": {}
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "quotas": {
+ "neutron": {
+ "network": -1,
+ "subnet": -1,
+ "router": -1
+ }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "CinderVolumes.create_and_attach_volume": [
+ {
+ "args": {
+ "size": {{volume_size}},
+ "image": {
+ "name": "{{image_name}}"
+ },
+ "flavor": {
+ "name": "{{flavor_name}}"
+ },
+ "nics": [
+ {"net-id": "{{fixed_net}}"}
+ ],
+ "create_volume_params": {},
+ "availability_zone": "{{availability_zone}}"
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "api_versions@openstack": { "cinder": {"service_type": "volumev3"} },
+ "quotas": {
+ "nova": {
+ "instances": -1,
+ "cores": -1,
+ "ram": -1,
+ "key_pairs": -1,
+ "security_groups": -1,
+ "security_group_rules": -1
+ },
+ "cinder": { "volumes": -1 }
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "CinderVolumes.create_and_delete_snapshot": [
+ {
+ "args": { "force": false },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "volumes": { "size": {{volume_size}} },
+ "quotas": {
+ "cinder": {
+ "snapshots": -1,
+ "volumes": -1
+ }
+ },
+ "api_versions@openstack": { "cinder": {"service_type": "volumev3"} }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "CinderVolumes.create_and_upload_volume_to_image": [
+ {
+ "args": {
+ "size": {{volume_size}},
+ "force": false,
+ "container_format": "bare",
+ "disk_format": "raw",
+ "do_delete": true,
+ "image": {
+ "name": "{{image_name}}"
+ }
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ },
+ "quotas": {
+ "cinder": {
+ "snapshots": -1,
+ "volumes": -1
+ }
+ },
+ "api_versions@openstack": { "cinder": {"service_type": "volumev3"} }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "GlanceImages.create_and_delete_image": [
+ {
+ "args": {
+ "image_location": "{{rbd_image}}",
+ "container_format": "bare",
+ "disk_format": "qcow2"
+ },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ],
+ "HeatStacks.create_and_delete_stack": [
+ {
+ "args": { "template_path": "{{heat_template}}" },
+ "runner": {
+ "type": "constant",
+ "concurrency": {{concurrency}},
+ "times": {{times}}
+ },
+ "context": {
+ "users": {
+ "tenants": {{users}},
+ "users_per_tenant": {{tenants}}
+ }
+ },
+ "sla": { "failure_rate": { "max": 0 } }
+ }
+ ]
+}
diff --git a/scripts/cmp_check.sh b/scripts/cmp_check.sh
index 26e0d76..823c0b4 100644
--- a/scripts/cmp_check.sh
+++ b/scripts/cmp_check.sh
@@ -125,6 +125,7 @@
function vm_create() {
[ ! "$silent" = true ] && set -x
openstack server create --nic net-id=${fixed_net_left_id} --image ${cirros35_id} --flavor ${flavor_tiny_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
+ #openstack server create --nic net-id=${fixed_net_left_id} --image ${ubuntuspt_id} --flavor ${flavor_high_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
[ ! 0 -eq $? ] && errors+=("${1}/${2}: $(cat ${tmp_out})")
set +x
[ ! "$silent" = true ] && cat ${tmp_out}
diff --git a/scripts/prepare.sh b/scripts/prepare.sh
index d2f60f2..b79fec7 100644
--- a/scripts/prepare.sh
+++ b/scripts/prepare.sh
@@ -188,7 +188,7 @@
}
function _project() {
- echo project create --description \"CVP Pipeline project\" ${project} >>${cmds}
+ echo project create ${project} >>${cmds}
echo role add --user admin --project ${project} admin >>${cmds}
}
@@ -199,7 +199,7 @@
}
function _sg_all() {
- echo security group create --project ${project} --description \"ICMP, SSH, iPerf, HTTP\" ${sg_all} >>${cmds}
+ echo security group create --project ${project} ${sg_all} >>${cmds}
# icmp
echo security group rule create --protocol icmp ${sg_all} >>${cmds}
# ssh
@@ -217,12 +217,12 @@
}
function _sg_icmp() {
- echo security group create --project ${project} --description \"ICMP\" ${sg_icmp} >>${cmds}
+ echo security group create --project ${project} ${sg_icmp} >>${cmds}
echo security group rule create --protocol icmp ${sg_icmp} >>${cmds}
}
function _sg_ssh() {
- echo security group create --project ${project} --description \"ICMP, SSH\" ${sg_ssh} >>${cmds}
+ echo security group create --project ${project} ${sg_ssh} >>${cmds}
# icmp
echo security group rule create --protocol icmp ${sg_ssh} >>${cmds}
# ssh
@@ -230,7 +230,7 @@
}
function _sg_iperf() {
- echo security group create --project ${project} --description \"ICMP, iPerf\" ${sg_iperf} >>${cmds}
+ echo security group create --project ${project} ${sg_iperf} >>${cmds}
# icmp
echo security group rule create --protocol icmp ${sg_iperf} >>${cmds}
# iperf