projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into Azure
[osm/RO.git]
/
osm_ro
/
vimconn_vmware.py
diff --git
a/osm_ro/vimconn_vmware.py
b/osm_ro/vimconn_vmware.py
index
a20e5c9
..
f343eea
100644
(file)
--- a/
osm_ro/vimconn_vmware.py
+++ b/
osm_ro/vimconn_vmware.py
@@
-2200,7
+2200,7
@@
class vimconnector(vimconn.vimconnector):
media_upload_href = match.group(1)
else:
raise Exception('Could not parse the upload URL for the media file from the last response')
media_upload_href = match.group(1)
else:
raise Exception('Could not parse the upload URL for the media file from the last response')
-
+ upload_iso_task = self.get_task_from_response(response.content)
headers['Content-Type'] = 'application/octet-stream'
response = self.perform_request(req_type='PUT',
url=media_upload_href,
headers['Content-Type'] = 'application/octet-stream'
response = self.perform_request(req_type='PUT',
url=media_upload_href,
@@
-2209,6
+2209,9
@@
class vimconnector(vimconn.vimconnector):
if response.status_code != 200:
raise Exception('PUT request to "{}" failed'.format(media_upload_href))
if response.status_code != 200:
raise Exception('PUT request to "{}" failed'.format(media_upload_href))
+ result = self.client.get_task_monitor().wait_for_success(task=upload_iso_task)
+ if result.get('status') != 'success':
+ raise Exception('The upload iso task failed with status {}'.format(result.get('status')))
def get_vcd_availibility_zones(self,respool_href, headers):
""" Method to find presence of av zone is VIM resource pool
def get_vcd_availibility_zones(self,respool_href, headers):
""" Method to find presence of av zone is VIM resource pool
@@
-6482,6
+6485,7
@@
class vimconnector(vimconn.vimconnector):
self.org_name))
host = self.url
client = Client(host, verify_ssl_certs=False)
self.org_name))
host = self.url
client = Client(host, verify_ssl_certs=False)
+ client.set_highest_supported_version()
client.set_credentials(BasicLoginCredentials(self.user, self.org_name, self.passwd))
# connection object
self.client = client
client.set_credentials(BasicLoginCredentials(self.user, self.org_name, self.passwd))
# connection object
self.client = client