Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ install:
- pip install "cloudshell-core>=2.0.0,<2.1.0" --extra-index-url https://testpypi.python.org/simple
- chmod 777 ./cloudshell_shell_core_install.sh
- ./cloudshell_shell_core_install.sh
- pip install "cloudshell-automation-api>=7.1.0.0,<7.2.0.0" --extra-index-url https://testpypi.python.org/simple
- pip install "cloudshell-automation-api>=8.0.0.0,<8.1.0.0" --extra-index-url https://testpypi.python.org/simple
language: python
notifications:
webhools: "https://qualisystems.getbadges.io/api/app/webhook/63350e33-4119-49c3-8127-075aaa022926"
Expand Down
2 changes: 1 addition & 1 deletion deployment_drivers/deploy_clone_from_vm/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jsonpickle==0.9.3
cloudshell-automation-api>=7.1.0.0,<7.2.0.0
cloudshell-automation-api>=8.0.0.0,<8.1.0.0
cloudshell-cp-vcenter>=1.6.0,<1.7.0
cloudshell-shell-core>=2.0.0,<2.1.0
2 changes: 1 addition & 1 deletion deployment_drivers/deploy_from_image/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jsonpickle==0.9.3
cloudshell-automation-api>=7.1.0.0,<7.2.0.0
cloudshell-automation-api>=8.0.0.0,<8.1.0.0
cloudshell-cp-vcenter>=1.6.0,<1.7.0
cloudshell-shell-core>=2.0.0,<2.1.0
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jsonpickle==0.9.3
cloudshell-automation-api>=7.1.0.0,<7.2.0.0
cloudshell-automation-api>=8.0.0.0,<8.1.0.0
cloudshell-cp-vcenter>=1.6.0,<1.7.0
cloudshell-shell-core>=2.0.0,<2.1.0
2 changes: 1 addition & 1 deletion deployment_drivers/deploy_from_template/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jsonpickle==0.9.3
cloudshell-automation-api>=7.1.0.0,<7.2.0.0
cloudshell-automation-api>=8.0.0.0,<8.1.0.0
cloudshell-cp-vcenter>=1.6.0,<1.7.0
cloudshell-shell-core>=2.0.0,<2.1.0
16 changes: 10 additions & 6 deletions package/cloudshell/cp/vcenter/common/vcenter/vmomi_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@
from cloudshell.cp.vcenter.exceptions.task_waiter import TaskFaultException



class VCenterAuthError (Exception):
def __init__(self, original_exception):
super(VCenterAuthError, self).__init__(original_exception.message)
class VCenterAuthError(Exception):
def __init__(self, message, original_exception):
"""
:param str message:
:param original_exception: The orginoal exception that was raised
:return:
"""
super(VCenterAuthError, self).__init__(message)
self.original_exception = original_exception


Expand Down Expand Up @@ -72,7 +76,7 @@ def connect(self, address, user, password, port=443):
si = self.pyvmomi_connect(host=address, user=user, pwd=password, port=port)
return si
except vim.fault.InvalidLogin as e:
raise VCenterAuthError(e.msg)
raise VCenterAuthError(e.msg, e)
except IOError as e:
# logger.info("I/O error({0}): {1}".format(e.errno, e.strerror))
raise ValueError('Cannot connect to vCenter, please check that the address is valid')
Expand Down Expand Up @@ -314,7 +318,7 @@ def get_obj(self, content, vimtype, name):
@staticmethod
def _get_all_objects_by_type(content, vimtype):
container = content.viewManager.CreateContainerView(
content.rootFolder, vimtype, True)
content.rootFolder, vimtype, True)
return container

@staticmethod
Expand Down
2 changes: 1 addition & 1 deletion package/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cloudshell-automation-api>=7.1.0.0,<7.2.0.0
cloudshell-automation-api>=8.0.0.0,<8.1.0.0
cloudshell-core>=2.0.0,<2.1.0
pyvmomi==6.0.0
jsonpickle==0.9.3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cloudshell-automation-api>=7.1.0.0,<7.2.0.0
cloudshell-automation-api>=8.0.0.0,<8.1.0.0
cloudshell-core>=2.0.0,<2.1.0
cloudshell-cp-vcenter>=1.6.0,<1.7.0
cloudshell-shell-core>=2.3.0,<2.4.0