From 2a64a101536e221bcec897fca78b933c0d697e33 Mon Sep 17 00:00:00 2001
From: Thomas Merkel <tm@core.io>
Date: Tue, 25 Apr 2017 21:45:36 +0200
Subject: [PATCH] Support ips array as replacement of ip variable

* Replaced type 'array' with type 'list' (which is a comma seperated list)
* Created type 'array' which is really an array
* Removed 'ip' field and replaced it by 'ips' array field
---
 app/assets/views/builder/index.html | 26 ++++++++++++++++----------
 app/js/controllers.js               | 15 +++++++++++++--
 app/js/models.js                    | 15 ++++++---------
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/app/assets/views/builder/index.html b/app/assets/views/builder/index.html
index f80fad8..e6334d4 100644
--- a/app/assets/views/builder/index.html
+++ b/app/assets/views/builder/index.html
@@ -196,18 +196,18 @@
 		<table class="table table-hover">
 			<thead>
 				<tr>
-					<th class="col-sm-3" colspan="2">ip</th>
-					<th class="col-sm-2">netmask</th>
+					<th class="col-sm-3" colspan="2">ips</th>
 					<th class="col-sm-2">gateway</th>
-					<th class="col-sm-2"></th>
+					<th class="col-sm-2">tag</th>
 					<th class="col-sm-3"></th>
 				</tr>
 			</thead>
 			<tbody>
 				<tr ng-repeat="nic in form.nics">
 					<td class="col-sm-1"><span class="glyphicon glyphicon-ok" ng-show="nic.primary"></span></td>
-					<td>{{nic.ip}}</td>
-					<td>{{nic.netmask}}</td>
+					<td>
+						<div ng-repeat="ip in nic.ips">{{ip}}</div>
+					</td>
 					<td>{{nic.gateway}}</td>
 					<td ng-switch on="nic.nic_tag">
 						<span ng-switch-when="admin" class="label label-danger">admin</span>
@@ -249,15 +249,21 @@ <h3>nic settings</h3>
 
 					<div class="modal-body">
 						<div class="form-group">
-							<label class="col-sm-3 col-md-2 control-label">IP</label>
+							<label class="col-sm-3 col-md-2 control-label">IPs</label>
 							<div class="col-sm-9 col-md-10">
-								<input type="text" class="form-control" placeholder="dhcp | aaa.bbb.ccc.ddd" ng-model="temp.ip">
+								<label class="control-label pull-right">
+									<a href="#edit-nic-settings" data-toggle="modal" ng-click="addIp()">
+										<span class="glyphicon glyphicon-plus-sign"></span>
+										add more ips
+									</a>
+								</label>
 							</div>
 						</div>
-						<div class="form-group">
-							<label class="col-sm-3 col-md-2 control-label">Netmask</label>
+						<div class="form-group has-feedback" ng-repeat="ip in temp.ips track by $index">
+							<label class="col-sm-3 col-md-2 control-label"> </label>
 							<div class="col-sm-9 col-md-10">
-								<input type="text" class="form-control" placeholder="aaa.bbb.ccc.ddd" ng-model="temp.netmask">
+								<input type="text" class="form-control" placeholder="aaa.bbb.ccc.ddd/ee | dhcp | addrconf" ng-model="temp.ips[$index]">
+								<div class="form-control-feedback" aria-hidden="true"><a ng-click="removeIp($index)"><span class="glyphicon glyphicon-minus-sign"></span></a></div>
 							</div>
 						</div>
 						<div class="form-group">
diff --git a/app/js/controllers.js b/app/js/controllers.js
index 4e3f0bf..b5a8c0c 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -52,14 +52,25 @@ function BuilderCtrl($scope, $routeParams, dsapiDatasets) {
     clearObject($scope.temp);
 
     $scope.temp = {
-      nic_tag: 'admin'
+      nic_tag: 'admin',
+      ips: []
     };
 
+    $scope.temp.ips.push('');
+
     if ($scope.isKVM()) {
       $scope.temp.model = ($scope.dataset.nic_driver ? $scope.dataset.nic_driver : $scope.valid_nic_models[0]);
     }
   }
 
+  $scope.addIp = function() {
+    $scope.temp.ips.push('');
+  }
+
+  $scope.removeIp = function(data) {
+    $scope.temp.ips.splice(data, 1);
+  }
+
   $scope.editNic = function(data) {
     var nic = {};
 
@@ -82,7 +93,7 @@ function BuilderCtrl($scope, $routeParams, dsapiDatasets) {
       }
     }
 
-    if (Object.keys(nic).length > 0 && nic.nic_tag && nic.ip) {
+    if (Object.keys(nic).length > 0 && nic.nic_tag && nic.ips.join('').split('').length > 0) {
       if (data._target) {
         delete nic._target;
 
diff --git a/app/js/models.js b/app/js/models.js
index 578fe8e..9a6a577 100644
--- a/app/js/models.js
+++ b/app/js/models.js
@@ -285,7 +285,7 @@ function DatasetJsonGenerator(dataset) {
   }
 
   /**
-   * type: boolean|integer|string|array
+   * type: boolean|integer|string|list|array
    */
   var _json_option_rules = {
     'image_uuid': [
@@ -321,7 +321,7 @@ function DatasetJsonGenerator(dataset) {
       [ 'kvm', 'joyent', 'lx' ]
     ],
     'resolvers': [
-      'array',
+      'list',
       null,
       [ 'kvm', 'joyent', 'lx' ]
     ],
@@ -404,13 +404,8 @@ function DatasetJsonGenerator(dataset) {
       null,
       [ 'kvm', 'joyent', 'lx' ]
     ],
-    'ip': [
-      'string',
-      null,
-      [ 'kvm', 'joyent', 'lx' ]
-    ],
-    'netmask': [
-      'string',
+    'ips': [
+      'array',
       null,
       [ 'kvm', 'joyent', 'lx' ]
     ],
@@ -540,6 +535,8 @@ function DatasetJsonGenerator(dataset) {
             }
           break;
           case 'array':
+          break;
+          case 'list':
             value = value.toString().split(/[\s,]+/);
             if (!value) {
               value = null;