diff options
6 files changed, 11 insertions, 6 deletions
diff --git a/doc/api_samples/os-agents/agent-post-resp.json b/doc/api_samples/os-agents/agent-post-resp.json index 418d11f504..f6c760cc67 100644 --- a/doc/api_samples/os-agents/agent-post-resp.json +++ b/doc/api_samples/os-agents/agent-post-resp.json @@ -1,6 +1,6 @@ { "agent": { - "agent_id": "1", + "agent_id": 1, "architecture": "x86", "hypervisor": "hypervisor", "md5hash": "add6bb58e139be103324d04d82d8f545", diff --git a/doc/api_samples/os-agents/agents-get-resp.json b/doc/api_samples/os-agents/agents-get-resp.json index 36eac4ced7..73ba45c240 100644 --- a/doc/api_samples/os-agents/agents-get-resp.json +++ b/doc/api_samples/os-agents/agents-get-resp.json @@ -1,7 +1,7 @@ { "agents": [ { - "agent_id": "1", + "agent_id": 1, "architecture": "x86", "hypervisor": "hypervisor", "md5hash": "add6bb58e139be103324d04d82d8f545", diff --git a/nova/api/openstack/compute/contrib/agents.py b/nova/api/openstack/compute/contrib/agents.py index ff1ea1e054..9c7c7bdca6 100644 --- a/nova/api/openstack/compute/contrib/agents.py +++ b/nova/api/openstack/compute/contrib/agents.py @@ -112,6 +112,11 @@ class AgentController(object): except exception.AgentBuildNotFound as ex: raise webob.exc.HTTPNotFound(explanation=ex.format_message()) + # NOTE(alex_xu): The agent_id should be integer that consistent with + # create/index actions. But parameter 'id' is string type that parsed + # from url. This is a bug, but because back-compatibility, it can't be + # fixed for v2 API. This will be fixed after v3 API feature exposed by + # micro-version in the future. lp bug #1333494 return {"agent": {'agent_id': id, 'version': version, 'url': url, 'md5hash': md5hash}} diff --git a/nova/tests/integrated/api_samples/os-agents/agent-post-resp.json.tpl b/nova/tests/integrated/api_samples/os-agents/agent-post-resp.json.tpl index abe83564f7..79e41ceafc 100644 --- a/nova/tests/integrated/api_samples/os-agents/agent-post-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-agents/agent-post-resp.json.tpl @@ -6,7 +6,7 @@ "version": "%(version)s", "md5hash": "%(md5hash)s", "url": "%(url)s", - "agent_id": "%(agent_id)d" + "agent_id": 1 } } diff --git a/nova/tests/integrated/api_samples/os-agents/agents-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-agents/agents-get-resp.json.tpl index dac1f76ffb..30562289fc 100644 --- a/nova/tests/integrated/api_samples/os-agents/agents-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-agents/agents-get-resp.json.tpl @@ -7,7 +7,7 @@ "version": "%(version)s", "md5hash": "%(md5hash)s", "url": "%(url)s", - "agent_id": "%(agent_id)d" + "agent_id": 1 } ] } diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 1319deb2f4..a8c0c3b5b4 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -1368,10 +1368,10 @@ class AgentsJsonTest(ApiSampleTestBaseV2): 'os': 'os', 'version': '8.0', 'md5hash': 'add6bb58e139be103324d04d82d8f545', - 'id': '1'}] + 'id': 1}] def fake_agent_build_create(context, values): - values['id'] = '1' + values['id'] = 1 agent_build_ref = models.AgentBuild() agent_build_ref.update(values) return agent_build_ref |