Merge ~blr/maas:add-machine-maas-objform into maas:master

[Kit Randel]

Unmerged commits

2849879... by Kit Randel on 2018-06-25

Initial form

b39b04e... by Kit Randel on 2018-06-24

Add partial

diff --git a/src/maasserver/static/js/angular/controllers/add_hardware.js b/src/maasserver/static/js/angular/controllers/add_hardware.js
index 5e1b0d8..9d9e612 100644
--- a/src/maasserver/static/js/angular/controllers/add_hardware.js
+++ b/src/maasserver/static/js/angular/controllers/add_hardware.js
@@ -19,6 +19,7 @@ angular.module('MAAS').controller('AddHardwareController', [
         parentScope.addHardwareScope = $scope;
 
         // Set initial values.
+        $scope.machineManager = MachinesManager;
         $scope.viewable = false;
         $scope.model = 'machine';
         $scope.zones = ZonesManager.getItems();
@@ -367,7 +368,7 @@ angular.module('MAAS').controller('AddHardwareController', [
             var pxe_mac = macs.shift().mac;
             var extra_macs = macs.map(function(mac) { return mac.mac; });
 
-            // Return the new object.
+          // Return the new object.
             return {
                 hostname: machine.name,
                 domain: machine.domain,
diff --git a/src/maasserver/static/js/angular/directives/nodelist/add_machine.js b/src/maasserver/static/js/angular/directives/nodelist/add_machine.js
new file mode 100644
index 0000000..67f89f5
--- /dev/null
+++ b/src/maasserver/static/js/angular/directives/nodelist/add_machine.js
@@ -0,0 +1,5 @@
+angular.module('MAAS').directive('addMachine', function() {
+    return {
+        templateUrl: 'static/partials/nodelist/add-machine.html'
+    };
+});
diff --git a/src/maasserver/static/js/angular/services/manager.js b/src/maasserver/static/js/angular/services/manager.js
index 6703b52..2815f9d 100644
--- a/src/maasserver/static/js/angular/services/manager.js
+++ b/src/maasserver/static/js/angular/services/manager.js
@@ -389,7 +389,8 @@ angular.module('MAAS').service(
         };
 
         // Send the create information to the region.
-        Manager.prototype.createItem = function(item) {
+      Manager.prototype.createItem = function(item) {
+        console.log(item)
             var self = this;
             var method = this._handler + ".create";
             item = angular.copy(item);
diff --git a/src/maasserver/static/partials/nodelist/add-machine.html b/src/maasserver/static/partials/nodelist/add-machine.html
new file mode 100644
index 0000000..f458416
--- /dev/null
+++ b/src/maasserver/static/partials/nodelist/add-machine.html
@@ -0,0 +1,150 @@
+<maas-obj-form obj="machine" manager="machineManager" manager-method="createItem"
+    inline="false" save-on-blur="false" after-save="cancel">
+
+    <section class="page-header__section row">
+            <div class="p-form p-form--stacked ng-scope">
+            <div class="col-6">
+                <maas-obj-field
+                    type="text" key="name" label="Machine name" subtle="false"
+                    placeholder="Choose a machine name (optional)"
+                    label-width="2" input-width="3">
+                </maas-obj-field>
+                <maas-obj-field
+                    type="options" key="domain" label="Domain"
+                    options="domain as domain.name for domain in domains"
+                    label-width="2" input-width="3">
+                </maas-obj-field>
+                <maas-obj-field
+                    type="options" key="architecture" label="Architecture"
+                    options="arch for arch in architectures"
+                    label-width="2" input-width="3">
+                </maas-obj-field>
+                <maas-obj-field
+                    type="options" key="hwe_kernel" label="Minimum Kernel"
+                    options="hwe_kernel[0] as hwe_kernel[1] for hwe_kernel in hwe_kernels"
+                    label-width="2" input-width="3">
+                </maas-obj-field>
+                <maas-obj-field
+                    type="options" key="zone" label="Zone"
+                    options="zone as zone.name for zone in zones"
+                    label-width="2" input-width="3">
+                </maas-obj-field>
+                <maas-obj-field
+                    type="options" key="pool" label="Resource Pool"
+                    options="pool as pool.name for pool in pools"
+                    label-width="2" input-width="3">
+                </maas-obj-field>
+                <div class="p-form__group" data-ng-repeat="mac in machine.macs">
+                    <maas-obj-field
+                        type="text" key="mac_addresses" label="MAC Address"
+                        placeholder="00:00:00:00:00:00">
+                    </maas-obj-field>
+                </div>
+                <div class="p-form__group">
+                    <div class="col-3">&nbsp;</div>
+                    <div class="col-3">
+                        <button class="p-button--neutral u-float--right"
+                            data-ng-click="addMac()">+ Add MAC Address</button>
+                    </div>
+                </div>
+            </div>
+            <div class="col-6"
+                data-maas-power-parameters="power_types"
+                data-ng-model="machine.power">
+            </div>
+        </div>
+    </section>
+
+    <section class="page-header_section row">
+        <div class="page-header__controls p-strip u-align--right u-no-padding--bottom">
+            <hr>
+            <button class="p-button--base" type="button" data-ng-click="cancel()">Cancel</button>
+            <button class="p-button--neutral"
+                    data-ng-disabled="machineHasError()"
+                    data-ng-click="saveMachine(true)">Save and add another</button>
+            <button class="p-button--positive u-no-margin--top" maas-obj-save>Save Machine</button>
+        </div>
+    </section>
+</maas-obj-form>
+
+<!--
+<h3 class="page-header__dropdown-title">Add machine</h3>
+<form class="p-form p-form--stacked">
+    <div class="col-6">
+        <div class="p-form__group">
+            <label for="machine-name" class="p-form__label col-2">Machine name</label>
+            <div class="p-form__group-input col-3">
+                <input type="text" id="machine-name" placeholder="Choose a machine name (optional)"
+                    data-ng-model="machine.name">
+            </div>
+        </div>
+        <div class="p-form__group">
+            <label for="domain" class="p-form__label col-2">Domain</label>
+            <div class="p-form__group-input col-3">
+                <select name="domain" id="domain"
+                    data-ng-model="machine.domain"
+                    data-ng-options="domain as domain.name for domain in domains">
+                    <option value="" disabled>Choose a domain</option>
+                </select>
+            </div>
+        </div>
+        <div class="p-form__group">
+            <label for="architecture" class="p-form__label col-2">Architecture</label>
+            <div class="p-form__group-input col-3">
+                <select name="architecture" id="architecture"
+                    data-ng-model="machine.architecture"
+                    data-ng-options="arch for arch in architectures">
+                    <option value="" disabled>Choose an architecture</option>
+                </select>
+            </div>
+        </div>
+        <div class="p-form__group">
+            <label for="min_hwe_kernel" class="p-form__label col-2">Minimum Kernel</label>
+            <div class="p-form__group-input col-3">
+                <select name="min_hwe_kernel" id="min_hwe_kernel"
+                    data-ng-model="machine.min_hwe_kernel"
+                    data-ng-options="hwe_kernel[0] as hwe_kernel[1] for hwe_kernel in hwe_kernels">
+                    <option value="">No minimum kernel</option>
+                </select>
+            </div>
+        </div>
+        <div class="p-form__group">
+            <label for="zone4" class="p-form__label col-2">Zone</label>
+            <select name="zone" id="zone4" class="col-3"
+                data-ng-model="machine.zone"
+                data-ng-options="zone as zone.name for zone in zones">
+            </select>
+        </div>
+        <div class="p-form__group">
+            <label for="pool-select" class="p-form__label col-2">Resource pool</label>
+            <select name="pool" id="pool-select" class="col-3"
+                data-ng-model="machine.pool"
+                data-ng-options="pool as pool.name for pool in pools">
+            </select>
+        </div>
+        <div class="p-form__group" data-ng-repeat="mac in machine.macs">
+            <label for="mac-address" class="p-form__label col-2"><span data-ng-hide="mac !== machine.macs[0]">MAC Address</span>&nbsp;</label>
+            <div class="p-form__group-input col-3 p-search-box">
+                <input type="text" id="mac-address" placeholder="00:00:00:00:00:00" class="p-search-box__input"
+                    maxlength="17"
+                    data-ng-class="{ 'has-error': mac.error }"
+                    data-ng-model="mac.mac"
+                    data-ng-pattern="macAddressRegex"
+                    data-ng-change="validateMac(mac)"
+                    mac-address>
+                <button type="reset" title="Delete MAC" class="p-search-box__button"
+                    data-ng-hide="mac === machine.macs[0]" data-ng-click="removeMac(mac)"><i class="p-icon--close"></i></button>
+            </div>
+        </div>
+        <div class="p-form__group">
+            <div class="col-5">
+                <button class="p-button--neutral u-float--right" data-ng-click="addMac()">+ Add MAC Address</a>
+            </div>
+        </div>
+    </div>
+    <div class="col-6"
+        data-maas-power-parameters="power_types"
+        data-ng-model="machine.power">
+    </div>
+</form>
+-->
diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
index 8310b39..1da0666 100644
--- a/src/maasserver/static/partials/nodes-list.html
+++ b/src/maasserver/static/partials/nodes-list.html
@@ -356,86 +356,9 @@
         <hr />
         <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
         <section class="page-header__section ng-hide" data-ng-show="showMachine()">
-            <h3 class="page-header__dropdown-title">Add machine</h3>
-            <form class="p-form p-form--stacked">
-                <div class="col-6">
-                    <div class="p-form__group">
-                        <label for="machine-name" class="p-form__label col-2">Machine name</label>
-                        <div class="p-form__group-input col-3">
-                            <input type="text" id="machine-name" placeholder="Choose a machine name (optional)"
-                                data-ng-model="machine.name">
-                        </div>
-                    </div>
-                    <div class="p-form__group">
-                        <label for="domain" class="p-form__label col-2">Domain</label>
-                        <div class="p-form__group-input col-3">
-                            <select name="domain" id="domain"
-                                data-ng-model="machine.domain"
-                                data-ng-options="domain as domain.name for domain in domains">
-                                <option value="" disabled>Choose a domain</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="p-form__group">
-                        <label for="architecture" class="p-form__label col-2">Architecture</label>
-                        <div class="p-form__group-input col-3">
-                            <select name="architecture" id="architecture"
-                                data-ng-model="machine.architecture"
-                                data-ng-options="arch for arch in architectures">
-                                <option value="" disabled>Choose an architecture</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="p-form__group">
-                        <label for="min_hwe_kernel" class="p-form__label col-2">Minimum Kernel</label>
-                        <div class="p-form__group-input col-3">
-                            <select name="min_hwe_kernel" id="min_hwe_kernel"
-                                data-ng-model="machine.min_hwe_kernel"
-                                data-ng-options="hwe_kernel[0] as hwe_kernel[1] for hwe_kernel in hwe_kernels">
-                                <option value="">No minimum kernel</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="p-form__group">
-                        <label for="zone4" class="p-form__label col-2">Zone</label>
-                        <select name="zone" id="zone4" class="col-3"
-                            data-ng-model="machine.zone"
-                            data-ng-options="zone as zone.name for zone in zones">
-                        </select>
-                    </div>
-                    <div class="p-form__group">
-                        <label for="pool-select" class="p-form__label col-2">Resource pool</label>
-                        <select name="pool" id="pool-select" class="col-3"
-                            data-ng-model="machine.pool"
-                            data-ng-options="pool as pool.name for pool in pools">
-                        </select>
-                    </div>
-                    <div class="p-form__group" data-ng-repeat="mac in machine.macs">
-                        <label for="mac-address" class="p-form__label col-2"><span data-ng-hide="mac !== machine.macs[0]">MAC Address</span>&nbsp;</label>
-                        <div class="p-form__group-input col-3 p-search-box">
-                            <input type="text" id="mac-address" placeholder="00:00:00:00:00:00" class="p-search-box__input"
-                                maxlength="17"
-                                data-ng-class="{ 'has-error': mac.error }"
-                                data-ng-model="mac.mac"
-                                data-ng-pattern="macAddressRegex"
-                                data-ng-change="validateMac(mac)"
-                                mac-address>
-                            <button type="reset" title="Delete MAC" class="p-search-box__button"
-                                data-ng-hide="mac === machine.macs[0]" data-ng-click="removeMac(mac)"><i class="p-icon--close"></i></button>
-                        </div>
-                    </div>
-                    <div class="p-form__group">
-                        <div class="col-5">
-                            <button class="p-button--neutral u-float--right" data-ng-click="addMac()">+ Add MAC Address</a>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-6"
-                    data-maas-power-parameters="power_types"
-                    data-ng-model="machine.power">
-                </div>
-            </form>
+            <add-machine></add-machine>
         </section>
+
         <section class="page-header__section col-12 ng-hide" data-ng-show="showChassis()">
             <h3 class="page-header__dropdown-title">Add chassis</h3>
             <form action="post" class="p-form p-form--stacked">
@@ -458,21 +381,6 @@
         </section>
 
         <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
-        <section class="page-header__section col-12" data-ng-show="showMachine()">
-            <p class="page-header__message page-header__message--error ng-hide" data-ng-show="error">{$ error $}</p>
-            <div class="page-header__controls p-strip u-align--right u-no-padding--bottom">
-                <hr />
-                <button class="p-button--base" type="button" data-ng-click="cancel()">Cancel</button>
-                <button class="p-button--neutral"
-                    data-ng-disabled="machineHasError()"
-                    data-ng-click="saveMachine(true)">Save and add another</button>
-                <button class="p-button--positive"
-                    data-ng-disabled="machineHasError()"
-                    data-ng-click="saveMachine(false)">Save machine</button>
-            </div>
-        </section>
-
-        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
         <section class="page-header__section col-12 ng-hide" data-ng-show="showChassis()">
             <p class="page-header__message page-header__message--error ng-hide" data-ng-show="error">{$ error $}</p>
             <div class="page-header__controls p-strip u-align--right u-no-padding--bottom">
diff --git a/webpack.config.js b/webpack.config.js
index 00dadcb..34da078 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -13,6 +13,7 @@ module.exports = {
             glob.sync('./src/maasserver/static/js/angular/*.js'),
             glob.sync('./src/maasserver/static/js/angular/controllers/*.js'),
             glob.sync('./src/maasserver/static/js/angular/directives/*.js'),
+            glob.sync('./src/maasserver/static/js/angular/directives/nodelist/*.js'),
             glob.sync('./src/maasserver/static/js/angular/filters/*.js'),
             glob.sync('./src/maasserver/static/js/angular/services/*.js'),
             glob.sync('./src/maasserver/static/js/angular/factories/*.js')