From eba6a73a77d5b9f42a25a461f6e5bb31d7ad5159 Mon Sep 17 00:00:00 2001
From: srikanthv02 <srikanthv02@gmail.com>
Date: Tue, 23 Aug 2016 15:19:42 +0530
Subject: [PATCH 1/2] Resolved JIRA QA Bugs

---
 .../workzone/orchestration/popups/newTask.html      |  2 +-
 .../private/ajax/Settings/CreateProviders.html      |  8 ++++----
 .../private/ajax/Settings/DashboardSettings.html    |  2 +-
 client/htmls/private/ajax/Settings/ImagesList.html  |  2 +-
 .../private/ajax/Settings/NexusServerList.html      | 13 +++++++++++++
 client/htmls/private/ajax/Settings/cmdbList.html    |  2 +-
 server/app/routes/v1.0/routes_provider.js           |  4 ++--
 7 files changed, 23 insertions(+), 10 deletions(-)

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 c709ad262..9edb18b0f 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
@@ -154,7 +154,7 @@ <h5>Chef Server Details for - RLChefServer</h5>
 											</ul>
 											<ul ng-show="targetType==='blueprint'">
 												<li ng-repeat="blueprint in chefBluePrintList">
-													<label class="checkbox check-list">
+													<label class="checkbox check-list" ng-if="blueprint.blueprintType === 'instance_launch'">
 														<input name="blueprint" ng-value="blueprint._id" type="radio" ng-model="blueprint._isBlueprintSelected" class="radiobutton-list blueprint-{{blueprint._isBlueprintSelected}}">{{blueprint.name}}
 													</label>
 												</li>
diff --git a/client/htmls/private/ajax/Settings/CreateProviders.html b/client/htmls/private/ajax/Settings/CreateProviders.html
index 51a32e9ba..fe8691b00 100755
--- a/client/htmls/private/ajax/Settings/CreateProviders.html
+++ b/client/htmls/private/ajax/Settings/CreateProviders.html
@@ -26,14 +26,14 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
                                                             <select id="providertype" name="providerType" unique="true" uniqueconditionedby="orgname" class="chooseOrganization width-100" style="vertical-align: central" cat-validation="required" cdata="catalyst" skiprowid="yes" onchange="UtilityMethods.providerChanged($(this).val());">
                                                                 <option value="">Select Provider</option>
                                                                 <option value="AWS">AWS</option>
-                                                                <option value="OPENSTACK">OpenStack</option>
-                                                                <option value="VMWARE">VMware</option>
-                                                                <option value="AZURE">Azure</option>
+                                                                <option value="OPENSTACK">OPENSTACK</option>
+                                                                <option value="VMWARE">VMWARE</option>
+                                                                <option value="AZURE">AZURE</option>
                                                             </select>
                                                         </div>
                                                         <div class="col-lg-6 col-md-6">
                                                             <label for="">Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                                            <input name="providerName" placeholder="Enter Name of the Provider" id="name" class="form-control" type="text" cdata="catalyst" cat-validation="required" cat-validation-openstack="required" cat-validation-azure="required" cat-validation-vmware="required">
+                                                            <input name="providerName" placeholder="Enter Name of the Provider" id="name" class="form-control" type="text" cdata="catalyst" cat-validation="required,max15,nospace" cat-validation-openstack="required,max15,nospace" cat-validation-azure="required,max15,nospace" cat-validation-vmware="required,max15,nospace">
                                                         </div>
                                                     </div>
                                                     <div class="row foraws">
diff --git a/client/htmls/private/ajax/Settings/DashboardSettings.html b/client/htmls/private/ajax/Settings/DashboardSettings.html
index 1ff6bf4ba..702dc1bf9 100755
--- a/client/htmls/private/ajax/Settings/DashboardSettings.html
+++ b/client/htmls/private/ajax/Settings/DashboardSettings.html
@@ -135,7 +135,7 @@ <h4 class="modal-title">
         "pagingType": "full_numbers",
         "bInfo": false,
         "bLengthChange": false,
-        "paging": false,
+        "paging": true,
         "bFilter": false,
         "aoColumns": [{
             "bSortable": false
diff --git a/client/htmls/private/ajax/Settings/ImagesList.html b/client/htmls/private/ajax/Settings/ImagesList.html
index f5f4ba13a..2e6d17b3c 100755
--- a/client/htmls/private/ajax/Settings/ImagesList.html
+++ b/client/htmls/private/ajax/Settings/ImagesList.html
@@ -5,7 +5,7 @@
             <div class="widget-box">
                 <div class="widget-header">
                     <h5 class="widget-title" style="color:#4e5964;">
-                        <strong>Images</strong>
+                        <strong>VM Images</strong>
                     </h5>
                     <div class="widget-toolbar no-border">
                         <div>
diff --git a/client/htmls/private/ajax/Settings/NexusServerList.html b/client/htmls/private/ajax/Settings/NexusServerList.html
index 8c753f286..b91443d24 100755
--- a/client/htmls/private/ajax/Settings/NexusServerList.html
+++ b/client/htmls/private/ajax/Settings/NexusServerList.html
@@ -126,3 +126,16 @@ <h5 class="widget-title" style="color:#4e5964;">
 
 
 </script>
+<div class="col-md-5">
+</div>
+</div>
+</div>
+                    <div class="widget-toolbox padding-8 clearfix dataTables_wrapper">
+                       <div id="tableFooterLeft" class="pull-left"></div>
+                       <div id="tableFooterRight" class="pull-right"></div>
+                    </div> 
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/cmdbList.html b/client/htmls/private/ajax/Settings/cmdbList.html
index 5d596a826..47cb0fdd2 100755
--- a/client/htmls/private/ajax/Settings/cmdbList.html
+++ b/client/htmls/private/ajax/Settings/cmdbList.html
@@ -48,7 +48,7 @@ <h5 class="widget-title" style="color:#4e5964;">
 						"pagingType": "full_numbers",
 						"bInfo": false,
 						"bLengthChange": false,
-						"paging": false,
+						"paging": true,
 						"bFilter": false,
 						"aoColumns": [{
 								"bSortable": false
diff --git a/server/app/routes/v1.0/routes_provider.js b/server/app/routes/v1.0/routes_provider.js
index 70cd48eaa..e5ce8fedb 100644
--- a/server/app/routes/v1.0/routes_provider.js
+++ b/server/app/routes/v1.0/routes_provider.js
@@ -165,7 +165,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
 		var vmwarehost = req.body.vmwarehost;
 		var vmwaredc = req.body.vmwaredc;
 		var providerName = req.body.providerName;
-		var providerType = req.body.providerType.toLowerCase();
+		var providerType = req.body.providerType;
 		var pemFileName = null;
 		if(req.files && req.files.azurepem)
 			pemFileName = req.files.azurepem.originalFilename;
@@ -1153,7 +1153,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
 		var azureTenantId = req.body.azureTenantId;
 
 		var providerName = req.body.providerName;
-		var providerType = req.body.providerType.toLowerCase();
+		var providerType = req.body.providerType;
 		var pemFileName = null;
 		if(req.files && req.files.azurepem)
 			pemFileName = req.files.azurepem.originalFilename;

From 8d4f4c8bdcd8b002c438c306bc221d221764402e Mon Sep 17 00:00:00 2001
From: srikanthv02 <srikanthv02@gmail.com>
Date: Fri, 26 Aug 2016 12:16:28 +0530
Subject: [PATCH 2/2] QA Bugs resolved

---
 .../popups/orchestrationHistoryCtrl.js        |   2 +-
 .../ajax/Settings/CreateProviders.html        |   4 +-
 .../htmls/private/ajax/Settings/videos.html   | 226 +++++++++---------
 client/htmls/public/css/Dashboard.css         |   1 +
 client/htmls/public/dashing.html              |   4 +-
 5 files changed, 121 insertions(+), 116 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistoryCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistoryCtrl.js
index eac4ce752..de4ba54eb 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistoryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistoryCtrl.js
@@ -64,7 +64,7 @@
 				{ name:'Job Number',field:'buildNumber',cellTemplate:'<a target="_blank" title="Jenkins" ng-href="{{grid.appScope.task.taskConfig.jobURL}}/{{row.entity.buildNumber}}">{{row.entity.buildNumber}}</a>', sort:{ direction: 'desc'}, cellTooltip: true},
 				{ name:'Job Output',cellTemplate:'<span><a target="_blank" title="{{jobResultUrlName}}" class="fa fa-file-text bigger-120 btn cat-btn-update btn-sg tableactionbutton marginbottomright3" ng-repeat="jobResultUrlName in row.entity.jobResultURL" ng-href="{{jobResultUrlName}}"></a></span>',cellTooltip: true},
 				{ name:'Log Info',width: 90,cellTemplate:'<span title="Jenkins Log" class="fa fa-list bigger-120 btn cat-btn-update btn-sg tableactionbutton" ng-click="grid.appScope.historyLogs(row.entity);"></span>',cellTooltip: true},
-				{ name:'Status',field:'status',cellTemplate:'<div class="{{row.entity.status}}">{{row.entity.status}}</div>'},
+				{ name:'Status',field:'status',cellTemplate:'<div class="{{row.entity.status.toUpperCase()}}">{{row.entity.status.toUpperCase()}}</div>'},
 				{ name:'Start Time',field:'timestampStarted',cellTemplate:'<span title="{{row.entity.timestampStarted  | timestampToLocaleTime}}">{{row.entity.timestampStarted  | timestampToLocaleTime}}</span>',cellTooltip: true},
 				{ name:'End Time',field:'timestampEnded',cellTemplate:'<span title="{{row.entity.timestampEnded  | timestampToLocaleTime}}">{{row.entity.timestampEnded  | timestampToLocaleTime}}</span>',cellTooltip: true}
 				];
diff --git a/client/htmls/private/ajax/Settings/CreateProviders.html b/client/htmls/private/ajax/Settings/CreateProviders.html
index fe8691b00..ebb1c7f0a 100755
--- a/client/htmls/private/ajax/Settings/CreateProviders.html
+++ b/client/htmls/private/ajax/Settings/CreateProviders.html
@@ -187,7 +187,7 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
                                                     <div class="row forazure azureBlock">
                                                         <div class="col-lg-6 col-md-6 margintop20">
                                                             <label for="">Enter Subscription Id:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                                            <input name="azureSubscriptionId" id="azureSubscriptionId" class="form-control" type="text" cdata="catalyst" cat-validation-azure="required" placeholder="Enter the Subscription Id">
+                                                            <input name="azureSubscriptionId" id="azureSubscriptionId" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation-azure="required" placeholder="Enter the Subscription Id">
                                                         </div>
                                                         <div class="col-lg-6 col-md-6 margintop20">
                                                             <label for="">Enter Client Id:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
@@ -663,7 +663,7 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
                 $vmwareInputs.attr('cat-validation-vmware', 'required');
                 $azureInputs.attr('cat-validation-azure', 'required');
                 $openStack.attr('cat-validation-openstack', 'required');
-
+               // loadKeyPair(null, null, false, region, providerId);
             } else {
 
                 $secretInfo.attr('disabled', 'disabled');
diff --git a/client/htmls/private/ajax/Settings/videos.html b/client/htmls/private/ajax/Settings/videos.html
index ca62b4257..5f00fd48f 100755
--- a/client/htmls/private/ajax/Settings/videos.html
+++ b/client/htmls/private/ajax/Settings/videos.html
@@ -8,9 +8,7 @@
   width: 20px;
   height: 20px;
 }
-.row{
-  margin-top: 25px;
-}
+
 
 .play-overlay {
   display: none;
@@ -174,116 +172,122 @@
 
 </style>
 <div class="row">
-  <div class="col-md-12">
-    <div class="col-lg-4 col-md-4">
-    <div class="ui card video-clip">
-        <div class="video">
-            <iframe width="334" height="250" src="https://www.youtube.com/embed/Gkopvq56s7Y" frameborder="0" allowfullscreen></iframe>
-        </div>
-        <div class="content">
-          <h3 class="header">Autoscale</h3>
-          <div class="description">
-            This video demonstrates launching autoscale group in CFT using catalyst and basic behavior.
-          </div>
-        </div>
-    </div>
-  </div>
-    <!--  Start Video Object  --> <!--azure Windows-->
-    <div class="col-lg-4 col-md-4">
-    <div class="ui card video-clip">
-        <div class="video">
-            <iframe width="334" height="250" src="https://www.youtube.com/embed/iEsat5kBEjw" frameborder="0" allowfullscreen></iframe>
-        </div>
-        <div class="content">
-          <h3 class="header">Azure Windows</h3>
-          <div class="description">
-            This video demonstrates integration of Azure as provider with Catalyst.
-          </div>
-        </div>
-    </div>
-  </div>
-    <!--azure windows ends here-->
-    
-    <!--Hp helion starts here-->
-    <div class="col-lg-4 col-md-4">
-    <div class="ui card video-clip">
-        <div class="video">
-            <iframe width="334" height="250" src="https://www.youtube.com/embed/8dbVIJUQV0U" frameborder="0" allowfullscreen></iframe>
-        </div>
-        <div class="content">
-          <h3 class="header">Hp Helion</h3>
-          <div class="description">
-            This video demonstrates integration of HPHelion as provider with Catalyst.
-          </div>
-        </div>
-    </div>
-  </div>
-</div>
-</div>
-    <!--Hp helion ends here-->
-<div class="row">
-  <div class="col-lg-12 col-md-12">
-    <!--new design starts here-->
-    <div class="col-lg-4 col-md-4">
-    <div class="ui card video-clip">
-        <div class="video">
-            <iframe width="334" height="250" src="https://www.youtube.com/embed/LhaCdYZU9H0" frameborder="0" allowfullscreen></iframe>
-        </div>
-        <div class="content">
-          <h3 class="header">New Design</h3>
-          <div class="description">
-            This video demonstrates the new design for Blueprint creation page.
-          </div>
-        </div>
-    </div>
-  </div>
-    <!--new design ends here-->
-  
-  
-
-  
-    <div class="col-lg-4 col-md-4">
-        <div class="ui card video-clip">
-            <div class="video">
-                <iframe width="334" height="250" src="https://www.youtube.com/embed/KrNN9eMIg2Q" frameborder="0" allowfullscreen></iframe>
+   <div class="col-md-12">
+      <div class="widget-box">
+         <div class="widget-header">
+            <h5 class="widget-title widgetColor">
+               <strong>List of Videos</strong>
+            </h5>
+         </div>
+         <div class="widget-body">
+            <div class="widget-main widgetHeight">
+               <div class="col-lg-4 col-md-4">
+                  <div class="ui card video-clip">
+                     <div class="video">
+                        <iframe width="334" height="250" src="https://www.youtube.com/embed/Gkopvq56s7Y" frameborder="0" allowfullscreen></iframe>
+                     </div>
+                     <div class="content">
+                        <h3 class="header">Autoscale</h3>
+                        <div class="description">
+                           This video demonstrates launching autoscale group in CFT using catalyst and basic behavior.
+                        </div>
+                     </div>
+                  </div>
+               </div>
+               <!--  Start Video Object  --> <!--azure Windows-->
+               <div class="col-lg-4 col-md-4">
+                  <div class="ui card video-clip">
+                     <div class="video">
+                        <iframe width="334" height="250" src="https://www.youtube.com/embed/iEsat5kBEjw" frameborder="0" allowfullscreen></iframe>
+                     </div>
+                     <div class="content">
+                        <h3 class="header">Azure Windows</h3>
+                        <div class="description">
+                           This video demonstrates integration of Azure as provider with Catalyst.
+                        </div>
+                     </div>
+                  </div>
+               </div>
+               <!--azure windows ends here-->
+               <!--Hp helion starts here-->
+               <div class="col-lg-4 col-md-4">
+                  <div class="ui card video-clip">
+                     <div class="video">
+                        <iframe width="334" height="250" src="https://www.youtube.com/embed/8dbVIJUQV0U" frameborder="0" allowfullscreen></iframe>
+                     </div>
+                     <div class="content">
+                        <h3 class="header">Hp Helion</h3>
+                        <div class="description">
+                           This video demonstrates integration of HPHelion as provider with Catalyst.
+                        </div>
+                     </div>
+                  </div>
+               </div>
             </div>
-            <div class="content">
-              <h3 class="header">OpenStack</h3>
-              <div class="description">
-                This video demonstrates integration of OpenStack as provider with Catalyst.
-              </div>
-            </div>
-        </div>
-    </div>
-    <div class="col-lg-4 col-md-4">
-        <div class="ui card video-clip">
-            <div class="video">
-                <iframe width="334" height="250" src="https://www.youtube.com/embed/u0jVcCmFBBg" frameborder="0" allowfullscreen></iframe>
-            </div>
-            <div class="content">
-              <h3 class="header">VMware</h3>
-              <div class="description">
-                This video demonstrates integration of VMware as provider with Catalyst.
-              </div>
-            </div>
-        </div>
-    </div>
-  </div>
-</div>
-<div class="row">
-  <div class="col-lg-12">
-    <div class="col-lg-4 col-md-4">
-      <div class="ui card video-clip">
-            <div class="video">
-                <iframe width="334" height="250" src="https://www.youtube.com/embed/kzqlbbHS86U" frameborder="0" allowfullscreen></iframe>
+         </div>
+         <!--Hp helion ends here-->
+         <div class="row">
+            <div class="col-lg-12 col-md-12">
+               <!--new design starts here-->
+               <div class="col-lg-4 col-md-4">
+                  <div class="ui card video-clip">
+                     <div class="video">
+                        <iframe width="334" height="250" src="https://www.youtube.com/embed/LhaCdYZU9H0" frameborder="0" allowfullscreen></iframe>
+                     </div>
+                     <div class="content">
+                        <h3 class="header">New Design</h3>
+                        <div class="description">
+                           This video demonstrates the new design for Blueprint creation page.
+                        </div>
+                     </div>
+                  </div>
+               </div>
+               <!--new design ends here-->
+               <div class="col-lg-4 col-md-4">
+                  <div class="ui card video-clip">
+                     <div class="video">
+                        <iframe width="334" height="250" src="https://www.youtube.com/embed/KrNN9eMIg2Q" frameborder="0" allowfullscreen></iframe>
+                     </div>
+                     <div class="content">
+                        <h3 class="header">OpenStack</h3>
+                        <div class="description">
+                           This video demonstrates integration of OpenStack as provider with Catalyst.
+                        </div>
+                     </div>
+                  </div>
+               </div>
+               <div class="col-lg-4 col-md-4">
+                  <div class="ui card video-clip">
+                     <div class="video">
+                        <iframe width="334" height="250" src="https://www.youtube.com/embed/u0jVcCmFBBg" frameborder="0" allowfullscreen></iframe>
+                     </div>
+                     <div class="content">
+                        <h3 class="header">VMware</h3>
+                        <div class="description">
+                           This video demonstrates integration of VMware as provider with Catalyst.
+                        </div>
+                     </div>
+                  </div>
+               </div>
             </div>
-            <div class="content">
-              <h3 class="header">Upgrade</h3>
-              <div class="description">
-                This video demonstrates application deployment flow in catalyst.
-              </div>
+         </div>
+         <div class="row">
+            <div class="col-lg-12">
+               <div class="col-lg-4 col-md-4">
+                  <div class="ui card video-clip">
+                     <div class="video">
+                        <iframe width="334" height="250" src="https://www.youtube.com/embed/kzqlbbHS86U" frameborder="0" allowfullscreen></iframe>
+                     </div>
+                     <div class="content">
+                        <h3 class="header">Upgrade</h3>
+                        <div class="description">
+                           This video demonstrates application deployment flow in catalyst.
+                        </div>
+                     </div>
+                  </div>
+               </div>
             </div>
-        </div>
+         </div>
       </div>
-  </div>
+   </div>
 </div>
diff --git a/client/htmls/public/css/Dashboard.css b/client/htmls/public/css/Dashboard.css
index 2b69a2e4b..6a7c81c91 100644
--- a/client/htmls/public/css/Dashboard.css
+++ b/client/htmls/public/css/Dashboard.css
@@ -58,6 +58,7 @@
     z-index: 10;
     background: rgba(0, 0, 0, 0.1);
     text-decoration: none;
+    cursor: pointer;
   }
   .small-box > .small-box-footer:hover {
     color: #fff;
diff --git a/client/htmls/public/dashing.html b/client/htmls/public/dashing.html
index 6fb6ca192..e6428ae9f 100644
--- a/client/htmls/public/dashing.html
+++ b/client/htmls/public/dashing.html
@@ -1,10 +1,10 @@
 <html>
 <head>
 <title>Cost Dashboard of AWS</title>
-<script src="http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.12.0.min.js"></script>
+<script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.12.0.min.js"></script>
 <script src="js/jquery.gridster.js" charset="utf-8" ></script>
 <link rel="stylesheet" type="text/css" href="css/jquery.gridster.min.css">
-<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css">
 <style>
 .noTrackItems {
     margin-top: 50px;