openstack/rally-openstack
Code Issues Proposed changes

[CI] Update the magnum image name & increase timeouts

Browse Source 
This is required because of Magnum change I86d4dcc94fff622be4ee2acc8dd60ed81bc5d433

Change-Id: I5e36ceb142c8d32b47430efb0cc85b2a13e777fb
This commit is contained in:
Boris Pavlovic 2017-09-06 21:57:19 -07:00
parent 30c00ce001
commit 68f2c08088
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/rally/rally.conf.sample
View File

@ -268,15 +268,15 @@
# Time(in sec) to wait for magnum cluster to be created. (floating # Time(in sec) to wait for magnum cluster to be created. (floating
# point value) # point value)
#magnum_cluster_create_timeout = 1200.0 #magnum_cluster_create_timeout = 2400.0
# Time interval(in sec) between checks when waiting for cluster # Time interval(in sec) between checks when waiting for cluster
# creation. (floating point value) # creation. (floating point value)
#magnum_cluster_create_poll_interval = 1.0 #magnum_cluster_create_poll_interval = 2.0
# Time(in sec) to wait for k8s pod to be created. (floating point # Time(in sec) to wait for k8s pod to be created. (floating point
# value) # value)
#k8s_pod_create_timeout = 600.0 #k8s_pod_create_timeout = 1200.0
# Time interval(in sec) between checks when waiting for k8s pod # Time interval(in sec) between checks when waiting for k8s pod
# creation. (floating point value) # creation. (floating point value)

7
rally-jobs/rally-magnum.yaml
View File

@ -1,3 +1,4 @@
{% set image = "Fedora-Atomic-26-20170723.0.x86_64" %}
--- ---
MagnumClusterTemplates.list_cluster_templates: MagnumClusterTemplates.list_cluster_templates:
- -
@ -10,7 +11,7 @@
tenants: 1 tenants: 1
users_per_tenant: 1 users_per_tenant: 1
cluster_templates: cluster_templates:
image_id: "fedora-atomic-latest" image_id: {{ image }}
flavor_id: "m1.small" flavor_id: "m1.small"
master_flavor_id: "m1.small" master_flavor_id: "m1.small"
external_network_id: "public" external_network_id: "public"
@ -34,7 +35,7 @@
tenants: 1 tenants: 1
users_per_tenant: 1 users_per_tenant: 1
cluster_templates: cluster_templates:
image_id: "fedora-atomic-latest" image_id: {{ image }}
flavor_id: "m1.small" flavor_id: "m1.small"
master_flavor_id: "m1.small" master_flavor_id: "m1.small"
external_network_id: "public" external_network_id: "public"
@ -61,7 +62,7 @@
tenants: 1 tenants: 1
users_per_tenant: 1 users_per_tenant: 1
cluster_templates: cluster_templates:
image_id: "fedora-atomic-latest" image_id: {{ image }}
flavor_id: "m1.small" flavor_id: "m1.small"
master_flavor_id: "m1.small" master_flavor_id: "m1.small"
external_network_id: "public" external_network_id: "public"

8
rally/plugins/openstack/cfg/magnum.py
View File

@ -21,22 +21,22 @@ OPTS = {"benchmark": [
help="Time(in sec) to sleep after creating a resource before " help="Time(in sec) to sleep after creating a resource before "
"polling for the status."), "polling for the status."),
cfg.FloatOpt("magnum_cluster_create_timeout", cfg.FloatOpt("magnum_cluster_create_timeout",
default=1200.0, default=2400.0,
help="Time(in sec) to wait for magnum cluster to be " help="Time(in sec) to wait for magnum cluster to be "
"created."), "created."),
cfg.FloatOpt("magnum_cluster_create_poll_interval", cfg.FloatOpt("magnum_cluster_create_poll_interval",
default=1.0, default=2.0,
help="Time interval(in sec) between checks when waiting for " help="Time interval(in sec) between checks when waiting for "
"cluster creation."), "cluster creation."),
cfg.FloatOpt("k8s_pod_create_timeout", cfg.FloatOpt("k8s_pod_create_timeout",
default=600.0, default=1200.0,
help="Time(in sec) to wait for k8s pod to be created."), help="Time(in sec) to wait for k8s pod to be created."),
cfg.FloatOpt("k8s_pod_create_poll_interval", cfg.FloatOpt("k8s_pod_create_poll_interval",
default=1.0, default=1.0,
help="Time interval(in sec) between checks when waiting for " help="Time interval(in sec) between checks when waiting for "
"k8s pod creation."), "k8s pod creation."),
cfg.FloatOpt("k8s_rc_create_timeout", cfg.FloatOpt("k8s_rc_create_timeout",
default=600.0, default=1200.0,
help="Time(in sec) to wait for k8s rc to be created."), help="Time(in sec) to wait for k8s rc to be created."),
cfg.FloatOpt("k8s_rc_create_poll_interval", cfg.FloatOpt("k8s_rc_create_poll_interval",
default=1.0, default=1.0,

4
tests/unit/plugins/openstack/scenarios/magnum/test_utils.py
View File

@ -260,7 +260,7 @@ class MagnumScenarioTestCase(test.ScenarioTestCase):
{"apiVersion": "v1", "kind": "Pod", {"apiVersion": "v1", "kind": "Pod",
"metadata": {"name": "nginx"}}) "metadata": {"name": "nginx"}})
k8s_api.create_namespaced_pod.return_value = self.pod k8s_api.create_namespaced_pod.return_value = self.pod
mock_time.side_effect = [1, 2, 3, 4, 5, 900, 901] mock_time.side_effect = [1, 2, 3, 4, 5, 1800, 1801]
not_ready_pod = api_client.models.V1Pod() not_ready_pod = api_client.models.V1Pod()
not_ready_status = api_client.models.V1PodStatus() not_ready_status = api_client.models.V1PodStatus()
not_ready_status.phase = "not_ready" not_ready_status.phase = "not_ready"
@ -348,7 +348,7 @@ class MagnumScenarioTestCase(test.ScenarioTestCase):
rc = api_client.models.V1ReplicationController() rc = api_client.models.V1ReplicationController()
rc.spec = api_client.models.V1ReplicationControllerSpec() rc.spec = api_client.models.V1ReplicationControllerSpec()
rc.spec.replicas = manifest["spec"]["replicas"] rc.spec.replicas = manifest["spec"]["replicas"]
mock_time.side_effect = [1, 2, 3, 4, 5, 900, 901] mock_time.side_effect = [1, 2, 3, 4, 5, 1800, 1801]
k8s_api.create_namespaced_replication_controller.return_value = rc k8s_api.create_namespaced_replication_controller.return_value = rc
not_ready_rc = api_client.models.V1ReplicationController() not_ready_rc = api_client.models.V1ReplicationController()
not_ready_rc_status = ( not_ready_rc_status = (