From 64a0bcae5aacff2bf2445ab519b837b4e01cce60 Mon Sep 17 00:00:00 2001 From: Arata Notsu Date: Wed, 3 Apr 2013 19:31:09 +0900 Subject: baremetal: Change node api related to prov_mac_address Now prov_mac_address is going to be dropped from bm_nodes table. This patch adjust api to the change. A user is expected to create a node without specifying prov_mac_address, then add an interface having the address to the node. However, for compatibility, a user still can specify prov_mac_address when create a node. In this case, an interface having prov_mac_address is automatically added to the node. In response body of create, index and show, "prov_mac_address" field no longer exists since they are showed as a member of "interfaces" fileld. DocImpact Change-Id: I6653829364b0a641442d45e766493180d6f2a880 --- .../baremetal-node-create-req.json | 3 +-- .../baremetal-node-create-req.xml | 3 +-- .../baremetal-node-create-resp.json | 1 - .../baremetal-node-create-resp.xml | 1 - .../baremetal-node-create-with-address-req.json | 13 +++++++++++++ .../baremetal-node-create-with-address-req.xml | 11 +++++++++++ .../baremetal-node-create-with-address-resp.json | 21 +++++++++++++++++++++ .../baremetal-node-create-with-address-resp.xml | 19 +++++++++++++++++++ .../baremetal-node-list-resp.json | 1 - .../os-baremetal-nodes/baremetal-node-list-resp.xml | 1 - .../baremetal-node-show-resp.json | 1 - .../os-baremetal-nodes/baremetal-node-show-resp.xml | 1 - 12 files changed, 66 insertions(+), 10 deletions(-) create mode 100644 doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.json create mode 100644 doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.xml create mode 100644 doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.json create mode 100644 doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.xml (limited to 'doc') diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.json b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.json index fa6455c49..389517ed7 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.json +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.json @@ -7,7 +7,6 @@ "pm_address": "10.1.2.3", "pm_user": "pm_user", "pm_password": "pm_pass", - "prov_mac_address": "12:34:56:78:90:ab", "terminal_port": 8000 } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml index 3cbc3ea8a..a06b8d73f 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml @@ -6,6 +6,5 @@ local_gb="128" pm_address="10.1.2.3" pm_user="pm_user" - prov_mac_address="12:34:56:78:90:ab" terminal_port="8000" -/> \ No newline at end of file +/> diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.json b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.json index 0f176482c..fdb206560 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.json +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.json @@ -8,7 +8,6 @@ "memory_mb": 8192, "pm_address": "10.1.2.3", "pm_user": "pm_user", - "prov_mac_address": "12:34:56:78:90:ab", "service_host": "host", "terminal_port": 8000 } diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml index 20fb43b64..6a0b3a266 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml @@ -4,7 +4,6 @@ pm_address="10.1.2.3" cpus="8" memory_mb="8192" - prov_mac_address="12:34:56:78:90:ab" service_host="host" local_gb="128" id="1" diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.json b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.json new file mode 100644 index 000000000..82b6485b9 --- /dev/null +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.json @@ -0,0 +1,13 @@ +{ + "node": { + "service_host": "host", + "cpus": 8, + "memory_mb": 8192, + "local_gb": 128, + "pm_address": "10.1.2.3", + "pm_user": "pm_user", + "pm_password": "pm_pass", + "prov_mac_address": "12:34:56:78:90:ab", + "terminal_port": 8000 + } +} diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.xml new file mode 100644 index 000000000..8065c41c1 --- /dev/null +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.xml @@ -0,0 +1,11 @@ + + diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.json b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.json new file mode 100644 index 000000000..90ff4e371 --- /dev/null +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.json @@ -0,0 +1,21 @@ +{ + "node": { + "cpus": 8, + "id": 1, + "instance_uuid": null, + "interfaces": [ + { + "address": "12:34:56:78:90:ab", + "datapath_id": null, + "id": 1, + "port_no": null + } + ], + "local_gb": 128, + "memory_mb": 8192, + "pm_address": "10.1.2.3", + "pm_user": "pm_user", + "service_host": "host", + "terminal_port": 8000 + } +} diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.xml new file mode 100644 index 000000000..1432629ed --- /dev/null +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json b/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json index d85f7c6f7..1b8d5a8ce 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json @@ -16,7 +16,6 @@ "memory_mb": 8192, "pm_address": "10.1.2.3", "pm_user": "pm_user", - "prov_mac_address": "12:34:56:78:90:ab", "service_host": "host", "terminal_port": 8000 } diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml index feb3d6f1d..2afc47f67 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml @@ -5,7 +5,6 @@ pm_address="10.1.2.3" cpus="8" memory_mb="8192" - prov_mac_address="12:34:56:78:90:ab" service_host="host" local_gb="128" id="1" diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.json b/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.json index c407c20a2..a8ba25ef9 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.json +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.json @@ -15,7 +15,6 @@ "memory_mb": 8192, "pm_address": "10.1.2.3", "pm_user": "pm_user", - "prov_mac_address": "12:34:56:78:90:ab", "service_host": "host", "terminal_port": 8000 } diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml index 12d881a3f..438ee5921 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml @@ -4,7 +4,6 @@ pm_address="10.1.2.3" cpus="8" memory_mb="8192" - prov_mac_address="12:34:56:78:90:ab" service_host="host" local_gb="128" id="1" -- cgit