From f907522fc8dd0430cfec16153d1eeb6a948e073f Mon Sep 17 00:00:00 2001
From: srikanthv02 <srikanthv02@gmail.com>
Date: Mon, 21 Nov 2016 12:44:43 +0530
Subject: [PATCH] Fix for CAT-2511 and CAT-2492

---
 .../dashboard/design/controllers/blueprintCreateCtrl.js     | 6 +++---
 .../sections/dashboard/design/view/blueprintCreate.html     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
index ee1369490..bcea2785a 100755
--- a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
@@ -37,7 +37,7 @@
             blueprintCreation.providerListing = [];
             blueprintCreation.imageListing = [];
             blueprintCreation.regionListing = ''; 
-            blueprintCreation.keyPairListing = '';
+            blueprintCreation.keyPairListing = [];
             blueprintCreation.vpcListing = [];
             blueprintCreation.subnetListing = [];
             blueprintCreation.securityGroupListing = [];
@@ -157,7 +157,7 @@
                 blueprintCreation.imageListing = [];
                 blueprintCreation.instanceType = [];
                 blueprintCreation.regionListing = null;
-                blueprintCreation.keyPairListing = '';
+                blueprintCreation.keyPairListing = [];
                 blueprintCreation.regionListingAzure = [];
                 blueprintCreation.newEnt.vpcId = null
                 blueprintCreation.vpcListing = [];
@@ -202,7 +202,7 @@
                     bpCreateSer.getAWSProviderWithId(blueprintCreation.newEnt.providers).then(function(data){
                         if(blueprintCreation.newEnt.providers){
                             blueprintCreation.regionListing = data.providerRegion;
-                            blueprintCreation.keyPairListing = data.keyPairs[0].keyPairName;
+                            blueprintCreation.keyPairListing = data.keyPairs;
                             $scope.isRegionKeyPairLoading = false;
                         }
                     });    
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
index d63a5eb5d..6fb610022 100755
--- a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
+++ b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
@@ -150,7 +150,7 @@
                               </label>
                               <select ng-model="bpCreate.newEnt.keyPair" name="keypairId" class="instanceType chooseInstance width-100 form-control" required>
                                  <option value="">Select KeyPair </option>
-                                 <option value="{{bpCreate.keyPairListing}}">{{bpCreate.keyPairListing}}</option>
+                                 <option ng-repeat="keyPairListing in bpCreate.keyPairListing" value="{{keyPairListing._id}}">{{keyPairListing.keyPairName}}</option>
                               </select>
                            </div>
                            <div class="col-lg-4 col-md-4 margintop15" ng-if="providerType === 'AWS'  || providerType === 'AZURE'">