diff options
| -rw-r--r-- | docs/MultiCloud-API-Specification-V1.rst | 6 | ||||
| -rw-r--r-- | docs/MultiCloud-Administrator-Guide.rst | 6 | ||||
| -rw-r--r-- | docs/MultiCloud-Deployment-Guide.rst | 6 | ||||
| -rw-r--r-- | docs/MultiCloud-Test-CSIT.rst | 18 | ||||
| -rw-r--r-- | docs/MultiCloud-Test-Guide.rst | 6 | ||||
| -rw-r--r-- | docs/Multicloud-Fake_Cloud-Guide.rst | 6 | ||||
| -rw-r--r-- | docs/Release Notes.rst | 6 | ||||
| -rw-r--r-- | multivimbroker/multivimbroker/forwarder/views.py | 2 |
8 files changed, 37 insertions, 19 deletions
diff --git a/docs/MultiCloud-API-Specification-V1.rst b/docs/MultiCloud-API-Specification-V1.rst index 1bbee3f..ab0e3e9 100644 --- a/docs/MultiCloud-API-Specification-V1.rst +++ b/docs/MultiCloud-API-Specification-V1.rst @@ -1,6 +1,6 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. Copyright (c) 2017-2018 VMware, Inc. +.. + This work is licensed under a Creative Commons Attribution 4.0 + International License. ================================ MultiCloud API Specification V1 diff --git a/docs/MultiCloud-Administrator-Guide.rst b/docs/MultiCloud-Administrator-Guide.rst index 9cfb29d..98e520b 100644 --- a/docs/MultiCloud-Administrator-Guide.rst +++ b/docs/MultiCloud-Administrator-Guide.rst @@ -1,6 +1,6 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. Copyright (c) 2017-2018 VMware, Inc. +.. + This work is licensed under a Creative Commons Attribution 4.0 + International License. =================================== ONAP MultiCloud Administrator Guide diff --git a/docs/MultiCloud-Deployment-Guide.rst b/docs/MultiCloud-Deployment-Guide.rst index 45cb4a8..3550f77 100644 --- a/docs/MultiCloud-Deployment-Guide.rst +++ b/docs/MultiCloud-Deployment-Guide.rst @@ -1,6 +1,6 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. Copyright (c) 2017-2018 VMware, Inc. +.. + This work is licensed under a Creative Commons Attribution 4.0 + International License. ================================ ONAP MultiCloud Deployment Guide diff --git a/docs/MultiCloud-Test-CSIT.rst b/docs/MultiCloud-Test-CSIT.rst new file mode 100644 index 0000000..63fd87f --- /dev/null +++ b/docs/MultiCloud-Test-CSIT.rst @@ -0,0 +1,18 @@ +Clone integration repo + + git clone http://gerrit.onap.org/r/integration + +Setup more contains if needed + +The file 'setup.sh' under 'test/csit/plans/multicloud/functionality1' will setup multicloud containers for CSIT test. +Add more tests + +The file 'testplan.txt' under 'test/csit/plans/multicloud/functionality1/' specific the robot tests to be run. + +The content of 'testplan.txt' will looks like following: + + # Test suites are relative paths under [integration.git]/test/csit/tests/. + # Place the suites in run order. + multicloud/provision/sanity_test_multivim.robot + +When adding tests to file 'multicloud/provision/sanity_test_multivim.robot' , a 'verify-csit' job will be trigger for related patch, and related change will be tested. diff --git a/docs/MultiCloud-Test-Guide.rst b/docs/MultiCloud-Test-Guide.rst index 9e8c217..c48bb79 100644 --- a/docs/MultiCloud-Test-Guide.rst +++ b/docs/MultiCloud-Test-Guide.rst @@ -1,6 +1,6 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. Copyright (c) 2017-2018 VMware, Inc. +.. + This work is licensed under a Creative Commons Attribution 4.0 + International License. ========================== ONAP MultiCloud Test Guide diff --git a/docs/Multicloud-Fake_Cloud-Guide.rst b/docs/Multicloud-Fake_Cloud-Guide.rst index a9dc1f1..4a2087d 100644 --- a/docs/Multicloud-Fake_Cloud-Guide.rst +++ b/docs/Multicloud-Fake_Cloud-Guide.rst @@ -1,6 +1,6 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. Copyright (c) 2017-2018 VMware, Inc. +.. + This work is licensed under a Creative Commons Attribution 4.0 + International License. ================================ MultiCloud Fake_Cloud User Case diff --git a/docs/Release Notes.rst b/docs/Release Notes.rst index 71c6870..bb87b8c 100644 --- a/docs/Release Notes.rst +++ b/docs/Release Notes.rst @@ -1,6 +1,6 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. Copyright (c) 2017-2018 VMware, Inc. +.. + This work is licensed under a Creative Commons Attribution 4.0 + International License. ============= Release Notes diff --git a/multivimbroker/multivimbroker/forwarder/views.py b/multivimbroker/multivimbroker/forwarder/views.py index 4f6e6ef..89e222a 100644 --- a/multivimbroker/multivimbroker/forwarder/views.py +++ b/multivimbroker/multivimbroker/forwarder/views.py @@ -113,7 +113,7 @@ class CheckCapacity(BaseServer): for vim in body.get("VIMs", []): url = request.get_full_path().replace( "check_vim_capacity", "%s/capacity_check" % vim) - resp = self.send(vim, url, str(newbody), "POST") + resp = self.send(vim, url, json.dumps(newbody), "POST") if int(resp.status_code) != status.HTTP_200_OK: continue try: |