Code Review
/
multicloud
/
framework.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Support vmware_fake requests"
[multicloud/framework.git]
/
multivimbroker
/
multivimbroker
/
pub
/
msapi
/
extsys.py
diff --git
a/multivimbroker/multivimbroker/pub/msapi/extsys.py
b/multivimbroker/multivimbroker/pub/msapi/extsys.py
index
2058801
..
1208ac9
100644
(file)
--- a/
multivimbroker/multivimbroker/pub/msapi/extsys.py
+++ b/
multivimbroker/multivimbroker/pub/msapi/extsys.py
@@
-1,4
+1,5
@@
# Copyright (c) 2017 Wind River Systems, Inc.
# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 VMware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-13,7
+14,7
@@
import json
import logging
from multivimbroker.pub.exceptions import VimBrokerException
import logging
from multivimbroker.pub.exceptions import VimBrokerException
-from multivimbroker.pub.utils
.restcall import get_res_from_aai
+from multivimbroker.pub.utils
import restcall
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
@@
-26,9
+27,16
@@
def split_vim_to_owner_region(vim_id):
def get_vim_by_id(vim_id):
def get_vim_by_id(vim_id):
+ if vim_id == "vmware_fake":
+ return {
+ "type": "vmware",
+ "version": "4.0",
+ "vimId": vim_id
+ }
cloud_owner, cloud_region = split_vim_to_owner_region(vim_id)
cloud_owner, cloud_region = split_vim_to_owner_region(vim_id)
- ret = get_res_from_aai("/cloud-infrastructure/cloud-regions/cloud-region"
- "/%s/%s" % (cloud_owner, cloud_region))
+ ret = restcall.get_res_from_aai("/cloud-infrastructure/cloud-regions/"
+ "cloud-region/%s/%s" % (
+ cloud_owner, cloud_region))
if ret[0] != 0:
logger.error("Status code is %s, detail is %s." % (ret[2], ret[1]))
raise VimBrokerException(
if ret[0] != 0:
logger.error("Status code is %s, detail is %s." % (ret[2], ret[1]))
raise VimBrokerException(