From abfed00c0697e1593d3c829b9da14faab25ac84f Mon Sep 17 00:00:00 2001 From: liangke Date: Mon, 23 Oct 2017 16:24:37 +0800 Subject: Update fake_cloud registry and keystone v2.0 Change-Id: I60df7777dfed0ff0fac46aff9df2146076a9335b Issue-Id: MULTICLOUD-4 Signed-off-by: liangke --- docs/Multicloud-Fake_Cloud-Guide.rst | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'docs/Multicloud-Fake_Cloud-Guide.rst') diff --git a/docs/Multicloud-Fake_Cloud-Guide.rst b/docs/Multicloud-Fake_Cloud-Guide.rst index dc8af4c..1df19b7 100644 --- a/docs/Multicloud-Fake_Cloud-Guide.rst +++ b/docs/Multicloud-Fake_Cloud-Guide.rst @@ -22,30 +22,28 @@ Register vio information into AAI service with region name "vmware" and region i .. code-block:: console $ curl -X PUT -H "X-TransactionId":"get_aai_subr" -H "X-FromAppId":"AAI" -H "Accept":"application/json" \ - -H "Content-Type:"application/json" \ + -H "Content-Type:"application/json" -H "Authorization:Basic QUFJOkFBSQ==" \ https://aai_ip:aai_port/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/vmware/fake \ -d "{ "cloud-owner": "vmware", - "cloud-region-id": "vio", + "cloud-region-id": "fake", "cloud-type": "vmware", "cloud-region-version": "4.0", - "identity-url": "http://MSB_IP:MSB_PORT/api/multicloud-vio/v0/vmware_fake/identity/v3", - "sriov-automation": false, - "resource-version": "1505892661724", + "identity-url": "http://MSB_IP:MSB_PORT/api/multicloud/v0/vmware_fake/identity/v3", + "cloud-zone": "cloud zone", + "complex-name": "complex name", "esr-system-info-list": { "esr-system-info": [ { - "esr-system-info-id": "62e17285-c207-42b0-9d55-b472b274c254", - "system-name": "vim-fake-cloud", + "system-name": "vmware-fake-cloud", "type": "vim", "service-url": "http://127.0.0.1:5000/v3", "user-name": "admin", "password": "vmware", - "system-type": "vim", - "ssl-insecure": false, + "system-type": "VIM", + "ssl-insecure": true, "cloud-domain": "default", "default-tenant": "admin", - "resource-version": "1505892661819" } ] } @@ -59,7 +57,7 @@ the identity url reprent the fake cloud identity url. Test Examples ~~~~~~~~~~~~~ -the ${fake_identiy_url}= "http://MSB_IP:MSB_PORT/api/multicloud-vio/v0/vmware_fake/identity/v3" +the ${fake_identiy_url}= "http://MSB_IP:MSB_PORT/api/multicloud/v0/vmware_fake/identity/v3" the ${msb_address} = "MSB_IP:MSB_PORT" Get auth token @@ -76,7 +74,7 @@ test.json content example: :: { - "auth": sudo pip install virtualenv{ + "auth": { "scope": {"project": {"id": “”}}, "identity": { -- cgit 1.2.3-korg