diff --git a/client/cat3/src/factory/workzoneServices.js b/client/cat3/src/factory/workzoneServices.js index d42205a56..a0eefc21f 100644 --- a/client/cat3/src/factory/workzoneServices.js +++ b/client/cat3/src/factory/workzoneServices.js @@ -99,9 +99,9 @@ var url = '/blueprints/' + blueprintID; return $http.delete(fullUrl(url), Auth.getHeaderObject()); }, - launchBlueprint: function (blueprintID, version, envId, stackName) { + launchBlueprint: function (blueprintID, version, envId, stackName,domainName) { var url = '/blueprints/' + blueprintID + '/launch?version=' + version + - '&envId=' + envId + '&stackName=' + stackName; + '&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName; return $http.get(fullUrl(url), Auth.getHeaderObject()); }, getBlueprintById: function(blueprintId) { diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js index 5839b6065..6527ef150 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js @@ -79,7 +79,7 @@ versionOptional = versionsList[versionsList.length-1].ver; } var selectedVersionBpId = bpItem.bp.selectedVersionBpId; - workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, envParams.env, bpItem.stackName).then(function(bpLaunchResponse) { + workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, envParams.env, bpItem.stackName,bpItem.domainName).then(function(bpLaunchResponse) { $scope.isBPLogsLoading = false; var launchingInstance; if(bpLaunchResponse.data.id && bpLaunchResponse.data.id.length>0){ diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html index 41cc3064c..44af0b48d 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html @@ -1,14 +1,15 @@
× -

Confirmation

+

Confirmation

Enter a Unique Stack Name

+

Enter a Domain Name

Enter ARM Deployment Name

-
Are you sure you want to launch the Blueprint? Press Ok To continue
+
Are you sure you want to launch the Blueprint? Press Ok To continue
(Only numbers,letters allowed. No spaces and underscores) @@ -18,10 +19,23 @@

Enter ARM Deployment Name

+ +
+ (Only letters allowed. No spaces and underscores) + + +
+
+

Only letters allowed. No spaces and underscores.

+
+
+ +
+
-
+
@@ -36,6 +50,12 @@

Enter ARM Deployment Name

+
+ + +
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js index 00e97c895..d3ac3b9a0 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js @@ -11,20 +11,22 @@ .controller('blueprintLaunchParamsCtrl', ['$scope', '$modalInstance', 'items', function($scope, $modalInstance, items) { var launchHelper = { launch : function(){ - $modalInstance.close({bp:items,stackName:$scope.stackName}); + $modalInstance.close({bp:items,stackName:$scope.stackName,domainName:$scope.domainName}); } }; $scope.stackName=''; + $scope.domainName=''; $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; $scope.launchBP = function() { if(items.blueprintType === "aws_cf") { $scope.showCFTInputs = true; - } else if(items.blueprintType === "azure_arm") { + }else if(items.blueprintType === "azure_arm") { $scope.showARMInputs = true; - } - else { + }else if(items.domainNameCheck === true || items.domainNameCheck === "true") { + $scope.showBlueprintInputs = true; + }else { launchHelper.launch(); } }; @@ -36,6 +38,9 @@ $scope.confirmCFTLaunch(); } }; + $scope.launchBPWithDomainName = function(){ + launchHelper.launch(); + }; } ]); })(angular); diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html index 89499be44..855fd7d89 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html @@ -453,7 +453,8 @@
Script Details
- {{param}} + {{param}} + ..... @@ -470,7 +471,6 @@
Script Details
-
diff --git a/client/htmls/private/ajax/Aws-Production.html b/client/htmls/private/ajax/Aws-Production.html index 90f2c5e53..ab620da36 100644 --- a/client/htmls/private/ajax/Aws-Production.html +++ b/client/htmls/private/ajax/Aws-Production.html @@ -182,6 +182,17 @@

+
+ +
+
+ +
+
+ +
+
+
diff --git a/client/htmls/private/ajax/DesignBlueprint.html b/client/htmls/private/ajax/DesignBlueprint.html index 4dadd7215..289bcc4ed 100644 --- a/client/htmls/private/ajax/DesignBlueprint.html +++ b/client/htmls/private/ajax/DesignBlueprint.html @@ -140,6 +140,17 @@

+
+ +
+
+ +
+
+ +
+
+
diff --git a/client/htmls/private/ajax/DesignBlueprintAzure.html b/client/htmls/private/ajax/DesignBlueprintAzure.html index 5359540a0..ff8681de2 100644 --- a/client/htmls/private/ajax/DesignBlueprintAzure.html +++ b/client/htmls/private/ajax/DesignBlueprintAzure.html @@ -187,6 +187,17 @@

+
+ +
+
+ +
+
+ +
+
+
diff --git a/client/htmls/private/ajax/DesignBlueprintVmware.html b/client/htmls/private/ajax/DesignBlueprintVmware.html index 52ffee3d2..9a152573e 100644 --- a/client/htmls/private/ajax/DesignBlueprintVmware.html +++ b/client/htmls/private/ajax/DesignBlueprintVmware.html @@ -116,6 +116,17 @@

+
+ +
+
+ +
+
+ +
+
+