Skip to content

Commit b0b39fd

Browse files
alexazarhalexazarh
authored
Merge pull request #850 from QualiSystems/develop
Merge dev to master for release 1.6.0
2 parents 84e786e + d2a9b21 commit b0b39fd

54 files changed

Lines changed: 280 additions & 354 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ install:
88
- pip install "cloudshell-core>=2.0.0,<2.1.0" --extra-index-url https://testpypi.python.org/simple
99
- chmod 777 ./cloudshell_shell_core_install.sh
1010
- ./cloudshell_shell_core_install.sh
11-
- pip install "cloudshell-automation-api>=7.1.0.0,<7.2.0.0" --extra-index-url https://testpypi.python.org/simple
11+
- pip install "cloudshell-automation-api>=8.0.0.0,<8.1.0.0" --extra-index-url https://testpypi.python.org/simple
1212
language: python
1313
notifications:
1414
webhools: "https://qualisystems.getbadges.io/api/app/webhook/63350e33-4119-49c3-8127-075aaa022926"

‎deployment_drivers/deploy_clone_from_vm/driver.py‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,22 @@ def Deploy(self, context, Name=None):
3131
context.connectivity.admin_auth_token,
3232
context.reservation.domain)
3333

34+
app_request = jsonpickle.decode(context.resource.app_context.app_request_json)
35+
36+
if not Name:
37+
Name = app_request['name']
38+
39+
# Cloudshell >= v7.2 have no vCenter Name attribute, fill it from the cloudProviderName context attr
40+
cloud_provider_name = app_request["deploymentService"].get("cloudProviderName")
41+
42+
if cloud_provider_name:
43+
attrs = self.resource_model_parser.get_resource_attributes(context.resource)
44+
attrs["vCenter Name"] = cloud_provider_name
45+
3446
vcenter_template_resource_model = \
3547
self.resource_model_parser.convert_to_resource_model(context.resource,
3648
vCenterCloneVMFromVMResourceModel)
3749

38-
if not Name:
39-
Name = jsonpickle.decode(context.resource.app_context.app_request_json)['name']
40-
4150
deploy_from_template_details = DeployFromTemplateDetails(vcenter_template_resource_model, Name)
4251

4352
params = [InputNameValue('deploy_data', jsonpickle.encode(deploy_from_template_details, unpicklable=False))]

‎deployment_drivers/deploy_clone_from_vm/drivermetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.5.2">
1+
<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.6.0">
22
<Layout>
33
<Category Name="App Management">
44
<Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

‎deployment_drivers/deploy_clone_from_vm/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jsonpickle==0.9.3
2-
cloudshell-automation-api>=7.1.0.0,<7.2.0.0
3-
cloudshell-cp-vcenter>=1.5.0,<1.6.0
2+
cloudshell-automation-api>=8.0.0.0,<8.1.0.0
3+
cloudshell-cp-vcenter>=1.6.0,<1.7.0
44
cloudshell-shell-core>=2.0.0,<2.1.0

‎deployment_drivers/deploy_from_image/driver.py‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,25 @@ def Deploy(self, context, Name=None):
2929
context.connectivity.admin_auth_token,
3030
context.reservation.domain)
3131

32+
app_request = jsonpickle.decode(context.resource.app_context.app_request_json)
33+
34+
if not Name:
35+
Name = app_request['name']
36+
37+
# Cloudshell >= v7.2 have no vCenter Name attribute, fill it from the cloudProviderName context attr
38+
cloud_provider_name = app_request["deploymentService"].get("cloudProviderName")
39+
40+
if cloud_provider_name:
41+
attrs = self.resource_model_parser.get_resource_attributes(context.resource)
42+
attrs["vCenter Name"] = cloud_provider_name
43+
3244
# get vCenter resource name, template name, template folder
3345
vcenter_image_resource_model = \
3446
self.resource_model_parser.convert_to_resource_model(context.resource,
3547
vCenterVMFromImageResourceModel)
3648

3749
vcenter_res = vcenter_image_resource_model.vcenter_name
3850

39-
if not Name:
40-
Name = jsonpickle.decode(context.resource.app_context.app_request_json)['name']
4151

4252
deployment_info = self._get_deployment_info(vcenter_image_resource_model, Name)
4353

‎deployment_drivers/deploy_from_image/drivermetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Driver Description="Deploy App From Image" MainClass="driver.DeployFromImage" Name="VM Deployment From Image" Version="1.5.2">
1+
<Driver Description="Deploy App From Image" MainClass="driver.DeployFromImage" Name="VM Deployment From Image" Version="1.6.0">
22
<Layout>
33
<Category Name="App Management">
44
<Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

‎deployment_drivers/deploy_from_image/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jsonpickle==0.9.3
2-
cloudshell-automation-api>=7.1.0.0,<7.2.0.0
3-
cloudshell-cp-vcenter>=1.5.0,<1.6.0
2+
cloudshell-automation-api>=8.0.0.0,<8.1.0.0
3+
cloudshell-cp-vcenter>=1.6.0,<1.7.0
44
cloudshell-shell-core>=2.0.0,<2.1.0

‎deployment_drivers/deploy_from_linked_clone/driver.py‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,22 @@ def Deploy(self, context, Name=None):
3131
context.connectivity.admin_auth_token,
3232
context.reservation.domain)
3333

34+
app_request = jsonpickle.decode(context.resource.app_context.app_request_json)
35+
36+
if not Name:
37+
Name = app_request['name']
38+
39+
# Cloudshell >= v7.2 have no vCenter Name attribute, fill it from the cloudProviderName context attr
40+
cloud_provider_name = app_request["deploymentService"].get("cloudProviderName")
41+
42+
if cloud_provider_name:
43+
attrs = self.resource_model_parser.get_resource_attributes(context.resource)
44+
attrs["vCenter Name"] = cloud_provider_name
45+
3446
vcenter_template_resource_model = \
3547
self.resource_model_parser.convert_to_resource_model(context.resource,
3648
VCenterDeployVMFromLinkedCloneResourceModel)
3749

38-
if not Name:
39-
Name = jsonpickle.decode(context.resource.app_context.app_request_json)['name']
40-
4150
deploy_from_template_details = DeployFromTemplateDetails(vcenter_template_resource_model, Name)
4251

4352
params = [InputNameValue('deploy_data', jsonpickle.encode(deploy_from_template_details, unpicklable=False))]

‎deployment_drivers/deploy_from_linked_clone/drivermetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.5.2">
1+
<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.6.0">
22
<Layout>
33
<Category Name="App Management">
44
<Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

‎deployment_drivers/deploy_from_linked_clone/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jsonpickle==0.9.3
2-
cloudshell-automation-api>=7.1.0.0,<7.2.0.0
3-
cloudshell-cp-vcenter>=1.5.0,<1.6.0
2+
cloudshell-automation-api>=8.0.0.0,<8.1.0.0
3+
cloudshell-cp-vcenter>=1.6.0,<1.7.0
44
cloudshell-shell-core>=2.0.0,<2.1.0

0 commit comments

Comments
 (0)