Merge ~newell-jensen/maas:ui-pod-zones into maas:master

[Newell Jensen]

Add Pod zones to the UI for both adding and updating the configuration of a Pod.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b ui-pod-zones lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1767/console
COMMIT: d4d8c41c574a7fb054b59ae3644b4b5f657c5331

review: Needs Fixing

[Lee Trager (ltrager)]

LGTM!

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b ui-pod-zones lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1793/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b ui-pod-zones lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1795/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b ui-pod-zones lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1796/console
COMMIT: 428f294ea39d53855fc55aa836d41bf13e40d2d8

review: Needs Fixing

[Andres Rodriguez (andreserl)]

======================================================================
ERROR: maasserver.websockets.handlers.tests.test_pod.TestPodHandler.test_update
----------------------------------------------------------------------
Traceback (most recent call last):
testtools.testresult.real._StringException: Empty attachments:
  Twisted logs

Traceback (most recent call last):
  File "/run/build/maas/src/maastesting/runtest.py", line 138, in _run_user
    result = function(*args, **kwargs)
  File "/home/ubuntu/.buildout/eggs/testtools-2.2.0-py3.6.egg/testtools/testcase.py", line 719, in _run_test_method
    return self._get_test_method()()
  File "/usr/lib/python3/dist-packages/crochet/_eventloop.py", line 461, in wrapper
    return eventual_result.wait(timeout)
  File "/usr/lib/python3/dist-packages/crochet/_eventloop.py", line 231, in wait
    result.raiseException()
  File "/usr/lib/python3/dist-packages/twisted/python/failure.py", line 385, in raiseException
    raise self.value.with_traceback(self.tb)
maasserver.websockets.base.HandlerValidationError: {'zone': ['Select a valid choice. That choice is not one of the available choices.']}
======================================================================
ERROR: maasserver.websockets.handlers.tests.test_pod.TestPodHandler.test_create
----------------------------------------------------------------------
Traceback (most recent call last):
testtools.testresult.real._StringException: Empty attachments:
  Twisted logs

Traceback (most recent call last):
  File "/run/build/maas/src/maastesting/runtest.py", line 138, in _run_user
    result = function(*args, **kwargs)
  File "/home/ubuntu/.buildout/eggs/testtools-2.2.0-py3.6.egg/testtools/testcase.py", line 719, in _run_test_method
    return self._get_test_method()()
  File "/usr/lib/python3/dist-packages/crochet/_eventloop.py", line 461, in wrapper
    return eventual_result.wait(timeout)
  File "/usr/lib/python3/dist-packages/crochet/_eventloop.py", line 231, in wait
    result.raiseException()
  File "/usr/lib/python3/dist-packages/twisted/python/failure.py", line 385, in raiseException
    raise self.value.with_traceback(self.tb)
maasserver.websockets.base.HandlerValidationError: {'zone': ['Select a valid choice. That choice is not one of the available choices.']}

review: Needs Fixing

a86c104... by Newell Jensen on 2018-03-01

Fix broken tests.

diff --git a/src/maasserver/api/tests/test_pods.py b/src/maasserver/api/tests/test_pods.py
index 87a61d3..ada7a53 100644
--- a/src/maasserver/api/tests/test_pods.py
+++ b/src/maasserver/api/tests/test_pods.py
@@ -38,11 +38,13 @@ class PodMixin:
         pod_ip_adddress = factory.make_ipv4_address()
         pod_power_address = 'qemu+ssh://user@%s/system' % pod_ip_adddress
         pod_password = factory.make_name('password')
+        zone = factory.make_Zone()
         return {
             'type': pod_type,
             'power_address': pod_power_address,
             'power_pass': pod_password,
             'ip_address': pod_ip_adddress,
+            'zone': zone.id
         }
 
     def fake_pod_discovery(self):
@@ -234,6 +236,7 @@ class TestPodAPI(APITestCase.ForUser, PodMixin):
             'name': new_name,
             'power_address': pod_info['power_address'],
             'power_pass': pod_info['power_pass'],
+            'zone': pod_info['zone'],
         })
         self.assertEqual(
             http.client.OK, response.status_code, response.content)
diff --git a/src/maasserver/forms/pods.py b/src/maasserver/forms/pods.py
index c523e85..4ad1695 100644
--- a/src/maasserver/forms/pods.py
+++ b/src/maasserver/forms/pods.py
@@ -113,6 +113,9 @@ class PodForm(MAASModelForm):
         if not self.is_new:
             if self.instance.power_type != '':
                 self.initial['type'] = self.instance.power_type
+        self.fields['zone'] = ModelChoiceField(
+            required=False, queryset=Zone.objects.all())
+        self.initial['zone'] = Zone.objects.get_default_zone()
 
     def _clean_fields(self):
         """Override to dynamically add fields based on the value of `type`
@@ -145,7 +148,7 @@ class PodForm(MAASModelForm):
 
     def save(self, *args, **kwargs):
         """Persist the pod into the database."""
-        def check_for_duplicate(power_type, power_parameters):
+        def check_for_duplicate(zone, power_type, power_parameters):
             # When the Pod is new try to get a BMC of the same type and
             # parameters to convert the BMC to a new Pod. When the Pod is not
             # new the form will use the already existing pod instance to update
@@ -153,6 +156,7 @@ class PodForm(MAASModelForm):
             # a validation erorr will be raised from the model level.
             if self.is_new:
                 bmc = BMC.objects.filter(
+                    zone=zone,
                     power_type=power_type,
                     power_parameters=power_parameters).first()
                 if bmc is not None:
@@ -174,10 +178,12 @@ class PodForm(MAASModelForm):
             if existing_obj is not None:
                 self.instance = existing_obj
             self.instance = super(PodForm, self).save(commit=False)
+            self.instance.zone = zone
             self.instance.power_type = power_type
             self.instance.power_parameters = power_parameters
             return self.instance
 
+        zone = self.cleaned_data['zone']
         power_type = self.cleaned_data['type']
         # Set power_parameters to the generated param_fields.
         power_parameters = {
@@ -190,13 +196,14 @@ class PodForm(MAASModelForm):
             # Running in twisted reactor, do the work inside the reactor.
             d = deferToDatabase(
                 transactional(check_for_duplicate),
-                power_type, power_parameters)
+                zone, power_type, power_parameters)
             d.addCallback(update_obj)
             d.addCallback(lambda _: self.discover_and_sync_pod())
             return d
         else:
             # Perform the actions inside the executing thread.
-            existing_obj = check_for_duplicate(power_type, power_parameters)
+            existing_obj = check_for_duplicate(
+                zone, power_type, power_parameters)
             if existing_obj is not None:
                 self.instance = existing_obj
             self.instance = update_obj(self.instance)
diff --git a/src/maasserver/forms/tests/test_pods.py b/src/maasserver/forms/tests/test_pods.py
index 9c3b871..f20f2a7 100644
--- a/src/maasserver/forms/tests/test_pods.py
+++ b/src/maasserver/forms/tests/test_pods.py
@@ -131,12 +131,15 @@ class TestPodForm(MAASTransactionServerTestCase):
             [
                 'name',
                 'type',
+                'zone'
             ], list(form.fields))
 
     def test_creates_pod_with_discovered_information(self):
         discovered_pod, discovered_racks, failed_racks = (
             self.fake_pod_discovery())
+        zone = factory.make_Zone()
         pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
         request = MagicMock()
         request.user = factory.make_User()
         form = PodForm(data=pod_info, request=request)
@@ -148,6 +151,7 @@ class TestPodForm(MAASTransactionServerTestCase):
             cores=Equals(discovered_pod.cores),
             memory=Equals(discovered_pod.memory),
             cpu_speed=Equals(discovered_pod.cpu_speed),
+            zone=Equals(zone),
             power_type=Equals(pod_info['type']),
             power_parameters=Equals({
                 'power_address': pod_info['power_address'],
@@ -171,7 +175,9 @@ class TestPodForm(MAASTransactionServerTestCase):
     def test_creates_pod_with_name(self):
         discovered_pod, discovered_racks, failed_racks = (
             self.fake_pod_discovery())
+        zone = factory.make_Zone()
         pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
         request = MagicMock()
         request.user = factory.make_User()
         pod_name = factory.make_name('pod')
@@ -185,6 +191,7 @@ class TestPodForm(MAASTransactionServerTestCase):
             cores=Equals(discovered_pod.cores),
             memory=Equals(discovered_pod.memory),
             cpu_speed=Equals(discovered_pod.cpu_speed),
+            zone=Equals(zone),
             power_type=Equals(pod_info['type']),
             power_parameters=Equals({
                 'power_address': pod_info['power_address'],
@@ -200,7 +207,9 @@ class TestPodForm(MAASTransactionServerTestCase):
             self.fake_pod_discovery)
         pods_module.discover_pod.return_value = succeed(
             pods_module.discover_pod.return_value)
+        zone = yield deferToDatabase(factory.make_Zone)
         pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
         request = MagicMock()
         request.user = yield deferToDatabase(factory.make_User)
         form = yield deferToDatabase(PodForm, data=pod_info, request=request)
@@ -213,6 +222,7 @@ class TestPodForm(MAASTransactionServerTestCase):
             cores=Equals(discovered_pod.cores),
             memory=Equals(discovered_pod.memory),
             cpu_speed=Equals(discovered_pod.cpu_speed),
+            zone=Equals(zone),
             power_type=Equals(pod_info['type']),
             power_parameters=Equals({
                 'power_address': pod_info['power_address'],
@@ -244,7 +254,9 @@ class TestPodForm(MAASTransactionServerTestCase):
             self.fake_pod_discovery)
         pods_module.discover_pod.return_value = succeed(
             pods_module.discover_pod.return_value)
+        zone = yield deferToDatabase(factory.make_Zone)
         pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
         pod_name = factory.make_name('pod')
         pod_info['name'] = pod_name
         request = MagicMock()
@@ -259,6 +271,7 @@ class TestPodForm(MAASTransactionServerTestCase):
             cores=Equals(discovered_pod.cores),
             memory=Equals(discovered_pod.memory),
             cpu_speed=Equals(discovered_pod.cpu_speed),
+            zone=Equals(zone),
             power_type=Equals(pod_info['type']),
             power_parameters=Equals({
                 'power_address': pod_info['power_address'],
@@ -273,7 +286,9 @@ class TestPodForm(MAASTransactionServerTestCase):
         discovered_pod, discovered_racks, failed_racks = yield deferToDatabase(
             self.fake_pod_discovery)
         pods_module.discover_pod.return_value = fail(factory.make_exception())
+        zone = yield deferToDatabase(factory.make_Zone)
         pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
         request = MagicMock()
         request.user = yield deferToDatabase(factory.make_User)
         form = yield deferToDatabase(PodForm, data=pod_info, request=request)
@@ -289,7 +304,9 @@ class TestPodForm(MAASTransactionServerTestCase):
 
     def test_prevents_duplicate_pod(self):
         discovered_pod, _, _ = self.fake_pod_discovery()
+        zone = factory.make_Zone()
         pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
         request = MagicMock()
         request.user = factory.make_User()
         form = PodForm(data=pod_info, request=request)
@@ -301,9 +318,12 @@ class TestPodForm(MAASTransactionServerTestCase):
 
     def test_takes_over_bmc_with_pod(self):
         discovered_pod, _, _ = self.fake_pod_discovery()
+        zone = factory.make_Zone()
         pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
         bmc = factory.make_BMC(
-            power_type=pod_info['type'], power_parameters={
+            zone=zone, power_type=pod_info['type'],
+            power_parameters={
                 'power_address': pod_info['power_address'],
                 'power_pass': pod_info['power_pass'],
             })
@@ -318,7 +338,9 @@ class TestPodForm(MAASTransactionServerTestCase):
     def test_updates_existing_pod(self):
         discovered_pod, discovered_racks, failed_racks = (
             self.fake_pod_discovery())
+        zone = factory.make_Zone()
         pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
         orig_pod = factory.make_Pod(pod_type=pod_info['type'])
         new_name = factory.make_name("pod")
         pod_info['name'] = new_name
@@ -335,6 +357,7 @@ class TestPodForm(MAASTransactionServerTestCase):
             cores=Equals(discovered_pod.cores),
             memory=Equals(discovered_pod.memory),
             cpu_speed=Equals(discovered_pod.cpu_speed),
+            zone=Equals(zone),
             power_type=Equals(pod_info['type']),
             power_parameters=Equals({
                 'power_address': pod_info['power_address'],
@@ -362,7 +385,9 @@ class TestPodForm(MAASTransactionServerTestCase):
             self.fake_pod_discovery)
         pods_module.discover_pod.return_value = succeed(
             pods_module.discover_pod.return_value)
+        zone = yield deferToDatabase(factory.make_Zone)
         pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
         orig_pod = yield deferToDatabase(
             factory.make_Pod, pod_type=pod_info['type'])
         new_name = factory.make_name("pod")
@@ -382,6 +407,7 @@ class TestPodForm(MAASTransactionServerTestCase):
             cores=Equals(discovered_pod.cores),
             memory=Equals(discovered_pod.memory),
             cpu_speed=Equals(discovered_pod.cpu_speed),
+            zone=Equals(zone),
             power_type=Equals(pod_info['type']),
             power_parameters=Equals({
                 'power_address': pod_info['power_address'],
@@ -409,8 +435,9 @@ class TestPodForm(MAASTransactionServerTestCase):
     def test_discover_and_sync_existing_pod(self):
         discovered_pod, discovered_racks, failed_racks = (
             self.fake_pod_discovery())
+        zone = factory.make_Zone()
         pod_info = self.make_pod_info()
-        orig_pod = factory.make_Pod(pod_type=pod_info['type'])
+        orig_pod = factory.make_Pod(zone=zone, pod_type=pod_info['type'])
         request = MagicMock()
         request.user = factory.make_User()
         form = PodForm(data=pod_info, request=request, instance=orig_pod)
@@ -423,6 +450,7 @@ class TestPodForm(MAASTransactionServerTestCase):
             cores=Equals(discovered_pod.cores),
             memory=Equals(discovered_pod.memory),
             cpu_speed=Equals(discovered_pod.cpu_speed),
+            zone=Equals(zone),
             power_type=Equals(pod_info['type']),
             power_parameters=Equals({}),
             ip_address=Is(None),
@@ -447,9 +475,10 @@ class TestPodForm(MAASTransactionServerTestCase):
             self.fake_pod_discovery)
         pods_module.discover_pod.return_value = succeed(
             pods_module.discover_pod.return_value)
+        zone = yield deferToDatabase(factory.make_Zone)
         pod_info = self.make_pod_info()
         orig_pod = yield deferToDatabase(
-            factory.make_Pod, pod_type=pod_info['type'])
+            factory.make_Pod, zone=zone, pod_type=pod_info['type'])
         request = MagicMock()
         request.user = yield deferToDatabase(factory.make_User)
         form = yield deferToDatabase(
@@ -463,6 +492,7 @@ class TestPodForm(MAASTransactionServerTestCase):
             cores=Equals(discovered_pod.cores),
             memory=Equals(discovered_pod.memory),
             cpu_speed=Equals(discovered_pod.cpu_speed),
+            zone=Equals(zone),
             power_type=Equals(pod_info['type']),
             power_parameters=Equals({}),
             ip_address=Is(None),
@@ -486,7 +516,10 @@ class TestPodForm(MAASTransactionServerTestCase):
 
     def test_raises_unable_to_discover_because_no_racks(self):
         self.patch(pods_module, "discover_pod").return_value = ({}, {})
-        form = PodForm(data=self.make_pod_info())
+        zone = factory.make_Zone()
+        pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
+        form = PodForm(data=pod_info)
         self.assertTrue(form.is_valid(), form._errors)
         error = self.assertRaises(PodProblem, form.save)
         self.assertEquals(
@@ -498,7 +531,10 @@ class TestPodForm(MAASTransactionServerTestCase):
     def test_raises_unable_to_discover_because_no_racks_in_twisted(self):
         self.patch(pods_module, "discover_pod").return_value = succeed(
             ({}, {}))
-        form = yield deferToDatabase(PodForm, data=self.make_pod_info())
+        zone = yield deferToDatabase(factory.make_Zone)
+        pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
+        form = yield deferToDatabase(PodForm, data=pod_info)
         is_valid = yield deferToDatabase(form.is_valid)
         self.assertTrue(is_valid, form._errors)
 
@@ -519,7 +555,10 @@ class TestPodForm(MAASTransactionServerTestCase):
         self.patch(pods_module, "discover_pod").return_value = ({}, {
             failed_rack.system_id: exc,
         })
-        form = PodForm(data=self.make_pod_info())
+        zone = factory.make_Zone()
+        pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
+        form = PodForm(data=pod_info)
         self.assertTrue(form.is_valid(), form._errors)
         error = self.assertRaises(PodProblem, form.save)
         self.assertEquals(str(exc), str(error))
@@ -532,7 +571,10 @@ class TestPodForm(MAASTransactionServerTestCase):
         self.patch(pods_module, "discover_pod").return_value = succeed(({}, {
             failed_rack.system_id: exc,
         }))
-        form = yield deferToDatabase(PodForm, data=self.make_pod_info())
+        zone = yield deferToDatabase(factory.make_Zone)
+        pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
+        form = yield deferToDatabase(PodForm, data=pod_info)
         is_valid = yield deferToDatabase(form.is_valid)
         self.assertTrue(is_valid, form._errors)
 
diff --git a/src/maasserver/static/js/angular/controllers/pod_details.js b/src/maasserver/static/js/angular/controllers/pod_details.js
index cd47586..27d620a 100644
--- a/src/maasserver/static/js/angular/controllers/pod_details.js
+++ b/src/maasserver/static/js/angular/controllers/pod_details.js
@@ -1,7 +1,7 @@
-/* Copyright 2017 Canonical Ltd.  This software is licensed under the
+/* Copyright 2017-2018 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE).
  *
- * MAAS Node Details Controller
+ * MAAS Pod Details Controller
  */
 
 angular.module('MAAS').controller('PodDetailsController', [
@@ -54,19 +54,47 @@ angular.module('MAAS').controller('PodDetailsController', [
             }]
           }
         };
-        $scope.powerTypes = GeneralManager.getData("power_types");
+        $scope.power_types = GeneralManager.getData("power_types");
         $scope.domains = DomainsManager.getItems();
         $scope.zones = ZonesManager.getItems();
         $scope.section = {
           area: 'summary'
         };
         $scope.machinesSearch = 'pod-id:=invalid';
+        $scope.editing = false;
 
         // Return true if the authenticated user is super user.
         $scope.isSuperUser = function() {
             return UsersManager.isSuperUser();
         };
 
+        // Return true if at least a rack controller is connected to the
+        // region controller.
+        $scope.isRackControllerConnected = function() {
+            // If power_types exist then a rack controller is connected.
+            return $scope.power_types.length > 0;
+        };
+
+        // Return true when the edit buttons can be clicked.
+        $scope.canEdit = function() {
+            return (
+                $scope.isRackControllerConnected() &&
+                    $scope.isSuperUser());
+        };
+
+        // Called to edit the pod configuration.
+        $scope.editPodConfiguration = function() {
+            if(!$scope.canEdit()) {
+                return;
+            }
+            $scope.editing = true;
+        };
+
+        // Called when the cancel or save button is pressed.
+        $scope.exitEditPodConfiguration = function() {
+            $scope.editing = false;
+        };
+
         // Return true if there is an action error.
         $scope.isActionError = function() {
             return $scope.action.error !== null;
@@ -104,10 +132,10 @@ angular.module('MAAS').controller('PodDetailsController', [
         // Return the title of the pod type.
         $scope.getPodTypeTitle = function() {
             var i;
-            for(i = 0; i < $scope.powerTypes.length; i++) {
-                var powerType = $scope.powerTypes[i];
-                if(powerType.name === $scope.pod.type) {
-                    return powerType.description;
+            for(i = 0; i < $scope.power_types.length; i++) {
+                var power_type = $scope.power_types[i];
+                if(power_type.name === $scope.pod.type) {
+                    return power_type.description;
                 }
             }
             return $scope.pod.type;
diff --git a/src/maasserver/static/js/angular/controllers/pods_list.js b/src/maasserver/static/js/angular/controllers/pods_list.js
index 7de9734..c47adf7 100644
--- a/src/maasserver/static/js/angular/controllers/pods_list.js
+++ b/src/maasserver/static/js/angular/controllers/pods_list.js
@@ -1,4 +1,4 @@
-/* Copyright 2017 Canonical Ltd.  This software is licensed under the
+/* Copyright 2017-2018 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE).
  *
  * MAAS Pods List Controller
@@ -6,9 +6,10 @@
 
 angular.module('MAAS').controller('PodsListController', [
     '$scope', '$rootScope',
-    'PodsManager', 'UsersManager', 'GeneralManager', 'ManagerHelperService',
-    function($scope, $rootScope,
-        PodsManager, UsersManager, GeneralManager, ManagerHelperService) {
+    'PodsManager', 'UsersManager', 'GeneralManager', 'ZonesManager',
+    'ManagerHelperService', function(
+        $scope, $rootScope, PodsManager, UsersManager, GeneralManager,
+        ZonesManager, ManagerHelperService) {
 
         // Set title and page.
         $rootScope.title = "Pods";
@@ -50,6 +51,7 @@ angular.module('MAAS').controller('PodsListController', [
           obj: {}
         };
         $scope.powerTypes = GeneralManager.getData("power_types");
+        $scope.zones = ZonesManager.getItems();
 
         // Called to update `allViewableChecked`.
         function updateAllViewableChecked() {
@@ -223,7 +225,7 @@ angular.module('MAAS').controller('PodsListController', [
 
         // Load the required managers for this controller.
         ManagerHelperService.loadManagers($scope, [
-            PodsManager, UsersManager, GeneralManager]).then(
+            PodsManager, UsersManager, GeneralManager, ZonesManager]).then(
             function() {
                 $scope.loading = false;
             });
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_pod_details.js b/src/maasserver/static/js/angular/controllers/tests/test_pod_details.js
index e050b8f..269f6ed 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_pod_details.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_pod_details.js
@@ -1,4 +1,4 @@
-/* Copyright 2017 Canonical Ltd.  This software is licensed under the
+/* Copyright 2017-2018 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE).
  *
  * Unit tests for NodesListController.
@@ -151,13 +151,14 @@ describe("PodDetailsController", function() {
             }]
           }
         });
-        expect($scope.powerTypes).toBe(GeneralManager.getData('power_types'));
+        expect($scope.power_types).toBe(GeneralManager.getData('power_types'));
         expect($scope.domains).toBe(DomainsManager.getItems());
         expect($scope.zones).toBe(ZonesManager.getItems());
+        expect($scope.editing).toBe(false);
     });
 
-    it("calls loadManagers with PodsManager, UsersManager, GeneralManager",
-        function() {
+    it("calls loadManagers with PodsManager, UsersManager, GeneralManager, \
+        DomainsManager, ZonesManager", function() {
             var controller = makeController();
             expect(ManagerHelperService.loadManagers).toHaveBeenCalledWith(
                 $scope,
@@ -192,6 +193,78 @@ describe("PodDetailsController", function() {
         });
     });
 
+    describe("isRackControllerConnected", function() {
+        it("returns false no power_types", function() {
+            var controller = makeController();
+            $scope.power_types = [];
+            expect($scope.isRackControllerConnected()).toBe(false);
+        });
+
+        it("returns true if power_types", function() {
+            var controller = makeController();
+            $scope.power_types = [{}];
+            expect($scope.isRackControllerConnected()).toBe(true);
+        });
+    });
+
+    describe("canEdit", function() {
+        it("returns false if not super user", function() {
+            var controller = makeController();
+            spyOn($scope, "isSuperUser").and.returnValue(false);
+            spyOn(
+                $scope,
+                "isRackControllerConnected").and.returnValue(true);
+            expect($scope.canEdit()).toBe(false);
+        });
+
+        it("returns false if rack disconnected", function() {
+            var controller = makeController();
+            spyOn(
+                $scope,
+                "isRackControllerConnected").and.returnValue(false);
+            expect($scope.canEdit()).toBe(false);
+        });
+
+        it("returns true if super user, rack connected", function() {
+            var controller = makeController();
+            spyOn($scope, "isSuperUser").and.returnValue(true);
+            spyOn(
+                $scope,
+                "isRackControllerConnected").and.returnValue(true);
+            expect($scope.canEdit()).toBe(true);
+        });
+    });
+
+    describe("editPodConfiguration", function() {
+        it("sets editing to true if can edit",
+           function() {
+            var controller = makeController();
+            spyOn($scope, "canEdit").and.returnValue(true);
+            $scope.editing = false;
+            $scope.editPodConfiguration();
+            expect($scope.editing).toBe(true);
+        });
+
+        it("doesnt set editing to true if cannot",
+           function() {
+            var controller = makeController();
+            spyOn($scope, "canEdit").and.returnValue(false);
+            $scope.editing = false;
+            $scope.editPodConfiguration();
+            expect($scope.editing).toBe(false);
+        });
+    });
+
+    describe("exitEditPodConfiguration", function() {
+        it("sets editing to false on exiting pod configuration",
+           function() {
+            var controller = makeController();
+            $scope.editing = true;
+            $scope.exitEditPodConfiguration();
+            expect($scope.editing).toBe(false);
+        });
+    });
+
     describe("isActionError", function() {
 
         it("returns false if not action error", function() {
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_pods_list.js b/src/maasserver/static/js/angular/controllers/tests/test_pods_list.js
index 213b731..a474945 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_pods_list.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_pods_list.js
@@ -1,4 +1,4 @@
-/* Copyright 2017 Canonical Ltd.  This software is licensed under the
+/* Copyright 2017-2018 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE).
  *
  * Unit tests for NodesListController.
@@ -33,11 +33,13 @@ describe("PodsListController", function() {
     }));
 
     // Load the required managers.
-    var PodsManager, UsersManager, GeneralManager, ManagerHelperService;
+    var PodsManager, UsersManager, GeneralManager;
+    var ZonesManager, ManagerHelperService;
     beforeEach(inject(function($injector) {
         PodsManager = $injector.get("PodsManager");
         UsersManager = $injector.get("UsersManager");
         GeneralManager = $injector.get("GeneralManager");
+        ZonesManager = $injector.get("ZonesManager");
         ManagerHelperService = $injector.get("ManagerHelperService");
     }));
 
@@ -104,13 +106,15 @@ describe("PodsListController", function() {
         expect($scope.action.option).toBeNull();
         expect($scope.add.open).toBe(false);
         expect($scope.powerTypes).toBe(GeneralManager.getData('power_types'));
+        expect($scope.zones).toBe(ZonesManager.getItems());
     });
 
-    it("calls loadManagers with PodsManager, UsersManager, GeneralManager",
-        function() {
+    it("calls loadManagers with PodsManager, UsersManager, \
+        GeneralManager, ZonesManager", function() {
             var controller = makeController();
             expect(ManagerHelperService.loadManagers).toHaveBeenCalledWith(
-                $scope, [PodsManager, UsersManager, GeneralManager]);
+                $scope, [
+                    PodsManager, UsersManager, GeneralManager, ZonesManager]);
         });
 
     it("sets loading to false with loadManagers resolves", function() {
diff --git a/src/maasserver/static/partials/pod-details.html b/src/maasserver/static/partials/pod-details.html
index 5185ca6..eb0347a 100644
--- a/src/maasserver/static/partials/pod-details.html
+++ b/src/maasserver/static/partials/pod-details.html
@@ -144,7 +144,7 @@
                         <a href="" role="tab" class="p-tabs__link" data-ng-class="{ 'is-active': section.area === 'summary'}" data-ng-click="section.area = 'summary'">{$ pod.composed_machines_count $} composed machines</a>
                     </li>
                     <li class="p-tabs__item" role="presentation">
-                        <a href="" role="tab" class="p-tabs__link" data-ng-if="isSuperUser()" data-ng-class="{ 'is-active': section.area === 'power'}" data-ng-click="section.area= 'power'">Power</a>
+                        <a href="" role="tab" class="p-tabs__link" data-ng-if="isSuperUser()" data-ng-class="{ 'is-active': section.area === 'configuration'}" data-ng-click="section.area= 'configuration'">Configuration</a>
                     </li>
                 </nav>
             </nav>
@@ -201,22 +201,43 @@
             </div>
         </div>
     </section>
-    <section class="p-strip" data-ng-if="pod && section.area === 'power'">
-        <div class="row">
+    <section class="p-strip" data-ng-if="pod && section.area === 'configuration'">
+      <div class="row">
+	<div class="col-10">
+          <h2>Pod configuration</h2>
+        </div>
+        <div class="col-2">
+          <button class="p-button--neutral u-float--right"
+                data-ng-if="canEdit()"
+                data-ng-click="editPodConfiguration()">Edit</button>
+        </div>
+      </div>
+      <div class="row">
             <maas-obj-form obj="pod" manager="podManager" manager-method="updateItem"
-                table-form="true" save-on-blur="true">
+                table-form="true" save-on-blur="false" data-ng-disabled="!editing">
                 <div class="col-6">
                     <div class="col-6">
                         <dl>
                             <dt>Type</dt>
                             <dd>{$ getPodTypeTitle() $}</dd>
                         </dl>
+			<maas-obj-field type="options" key="zone" label="Zone" subtle="false" placeholder="Choose a zone"
+					options="zone.id as zone.name for zone in zones"></maas-obj-field>
                     </div>
                 </div>
                 <div class="col-6">
                     <maas-pod-parameters hide-type="true"></maas-pod-parameters>
                     <maas-obj-errors></maas-obj-errors>
                 </div>
+		<div class="row">
+		  <div class="col-12 u-align--right" data-ng-if="editing">
+		    <p maas-obj-hide-saving><maas-obj-errors></maas-obj-errors></p>
+		    <p maas-obj-show-saving><maas-obj-saving>Trying to connect and discover pod</maas-obj-saving></p>
+		    <button class="p-button--base"
+			    data-ng-click="exitEditPodConfiguration()">Cancel</button>
+		    <button class="p-button--positive" data-ng-click="exitEditPodConfiguration()" maas-obj-save>Save changes</button>
+		  </div>
+		</div>
             </maas-obj-form>
         </div>
     </section>
diff --git a/src/maasserver/static/partials/pods-list.html b/src/maasserver/static/partials/pods-list.html
index bd966ee..99b3f39 100644
--- a/src/maasserver/static/partials/pods-list.html
+++ b/src/maasserver/static/partials/pods-list.html
@@ -59,6 +59,8 @@
             <div class="row">
                 <div class="col-5">
                     <maas-obj-field type="text" key="name" label="Name" label-width="two" input-width="three" placeholder="Name (optional)"></maas-obj-field>
+		    <maas-obj-field type="options" key="zone" label="Zone" subtle="false" placeholder="Choose a zone"
+		        options="zone.id as zone.name for zone in zones"></maas-obj-field>
                 </div>
                 <div class="col-6 prefix-1">
                     <maas-pod-parameters></maas-pod-parameters>
diff --git a/src/maasserver/websockets/handlers/tests/test_pod.py b/src/maasserver/websockets/handlers/tests/test_pod.py
index 76eb0a2..9653bea 100644
--- a/src/maasserver/websockets/handlers/tests/test_pod.py
+++ b/src/maasserver/websockets/handlers/tests/test_pod.py
@@ -222,7 +222,9 @@ class TestPodHandler(MAASTransactionServerTestCase):
     def test_create(self):
         user = yield deferToDatabase(factory.make_admin)
         handler = PodHandler(user, {})
+        zone = yield deferToDatabase(factory.make_Zone)
         pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
         yield deferToDatabase(self.fake_pod_discovery)
         created_pod = yield handler.create(pod_info)
         self.assertIsNotNone(created_pod['id'])
@@ -232,7 +234,9 @@ class TestPodHandler(MAASTransactionServerTestCase):
     def test_update(self):
         user = yield deferToDatabase(factory.make_admin)
         handler = PodHandler(user, {})
+        zone = yield deferToDatabase(factory.make_Zone)
         pod_info = self.make_pod_info()
+        pod_info['zone'] = zone.id
         pod = yield deferToDatabase(
             factory.make_Pod, pod_type=pod_info['type'])
         pod_info['id'] = pod.id