Skip to content

Support ips array as replacement of ip variable #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
drscream wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support ips array as replacement of ip variable #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions app/assets/views/builder/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down
15 changes: 13 additions & 2 deletions app/js/controllers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};

Expand All @@ -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;

Expand Down
15 changes: 6 additions & 9 deletions app/js/models.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ function DatasetJsonGenerator(dataset) {
}

/**
* type: boolean|integer|string|array
* type: boolean|integer|string|list|array
*/
var _json_option_rules = {
'image_uuid': [
Expand Down Expand Up @@ -321,7 +321,7 @@ function DatasetJsonGenerator(dataset) {
[ 'kvm', 'joyent', 'lx' ]
],
'resolvers': [
'array',
'list',
null,
[ 'kvm', 'joyent', 'lx' ]
],
Expand Down Expand Up @@ -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' ]
],
Expand Down Expand Up @@ -540,6 +535,8 @@ function DatasetJsonGenerator(dataset) {
}
break;
case 'array':
break;
case 'list':
value = value.toString().split(/[\s,]+/);
if (!value) {
value = null;
Expand Down