diff options
| author |   Mark Beierl <mark.beierl@emc.com> | 2016-05-10 10:48:53 -0600 |
|---|---|---|
| committer | Mark Beierl <mark.beierl@emc.com> | 2016-05-10 10:49:00 -0600 |
| commit | c999a6716e412d36b7c91e15eaaca3ab3cd2bc93 (patch) | |
| tree | 810127f3f06600bad93bb1d4c783e667ddaace9f /rest_server.py | |
| parent | edbced4cda35e63c9ddc4e40a67807cbfd6d6c20 (diff) | |
Auth timeout fix and VM image selection
Fix the OpenStack client authentication timeout bug where we never
reauthenticate after authentication expires
Add the ability to specify what OS image from the Glance catalog
should be used for the Agent VM
Change-Id: I2ff8f5598b8d58ee2bf654b3572e9841b24cc9de
JIRA: STORPERF-42
Signed-off-by: Mark Beierl <mark.beierl@emc.com>
Diffstat (limited to 'rest_server.py')
| -rw-r--r-- | rest_server.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/rest_server.py b/rest_server.py index 72f849a..7fba94a 100644 --- a/rest_server.py +++ b/rest_server.py @@ -113,6 +113,7 @@ def results_page(job_id): class ConfigurationRequestModel: resource_fields = { 'agent_count': fields.Integer, + 'agent_image': fields.String, 'public_network': fields.String, 'volume_size': fields.Integer } @@ -122,6 +123,7 @@ class ConfigurationRequestModel: class ConfigurationResponseModel: resource_fields = { 'agent_count': fields.Integer, + 'agent_image': fields.String, 'public_network': fields.String, 'stack_created': fields.Boolean, 'stack_id': fields.String, @@ -142,6 +144,7 @@ class Configure(Resource): ) def get(self): return jsonify({'agent_count': storperf.agent_count, + 'agent_image': storperf.agent_image, 'public_network': storperf.public_network, 'volume_size': storperf.volume_size, 'stack_created': storperf.is_stack_created, @@ -171,6 +174,8 @@ class Configure(Resource): try: if ('agent_count' in request.json): storperf.agent_count = request.json['agent_count'] + if ('agent_image' in request.json): + storperf.agent_image = request.json['agent_image'] if ('public_network' in request.json): storperf.public_network = request.json['public_network'] if ('volume_size' in request.json): @@ -180,6 +185,7 @@ class Configure(Resource): storperf.create_stack() return jsonify({'agent_count': storperf.agent_count, + 'agent_image': storperf.agent_image, 'public_network': storperf.public_network, 'volume_size': storperf.volume_size, 'stack_id': storperf.stack_id}) |