From c570ee943ff5ba7c9747df1eee7f8ad4c6d5218e Mon Sep 17 00:00:00 2001
From: Rob Cresswell <robert.cresswell@outlook.com>
Date: Tue, 10 May 2016 14:03:04 +0100
Subject: [PATCH] Fix key import in angular Launch Instance

The key import modal was addressing the wrong values in the data
returned from the api layer. This patch fixes it.

Closes-Bug: 1577820
Change-Id: I4cb7cc4a9d26632d7084c83d7e601eca799d6e22
(cherry picked from commit e6e0a47eaed19741dd7534e5b840f668007d2739)
---
 .../launch-instance/keypair/import-keypair.controller.js      | 4 ++--
 .../launch-instance/keypair/import-keypair.controller.spec.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.js
index a892d6ba43..c674e54227 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.js
@@ -49,10 +49,10 @@
     }
 
     function successCallback(data) {
-      $modalInstance.close(data);
+      $modalInstance.close(data.data);
 
       var successMsg = gettext('Successfully imported key pair %(name)s.');
-      toastService.add('success', interpolate(successMsg, { name: data.name }, true));
+      toastService.add('success', interpolate(successMsg, { name: data.data.name }, true));
     }
 
     function cancel() {
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.spec.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.spec.js
index 0a27f54135..8857373aae 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.spec.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.spec.js
@@ -20,7 +20,7 @@
   describe('Launch Instance Import Key Pair Controller', function() {
 
     var novaAPI, ctrl, toastService, $q, $rootScope;
-    var model = { name: 'newKeypair', public_key: '' };
+    var data = { data: { name: 'newKeypair', public_key: '' } };
     var modalInstanceMock = {
       close: angular.noop,
       dismiss: angular.noop
@@ -58,7 +58,7 @@
 
       ctrl.submit();
 
-      deferredSuccess.resolve(model);
+      deferredSuccess.resolve(data);
       $rootScope.$apply();
 
       expect(novaAPI.createKeypair).toHaveBeenCalled();