Allow members to be set as "backup"
This is a follow up of octavia-api changes made in: I953abe71a0988da78efc6b3961f7518c81c2a06d Depends-On: https://review.openstack.org/#/c/561386/ Change-Id: I5b627802cc7089abc2d9e98a690f4c911afe8b77 Story: 2001777 Task: 12485
This commit is contained in:
parent
965e551e3b
commit
f1194d2dc1
@ -307,6 +307,7 @@ def add_member(request, **kwargs):
|
|||||||
monitor_address=monitor_address if monitor_address else None,
|
monitor_address=monitor_address if monitor_address else None,
|
||||||
monitor_port=member.get('monitor_port'),
|
monitor_port=member.get('monitor_port'),
|
||||||
admin_state_up=member.get('admin_state_up'),
|
admin_state_up=member.get('admin_state_up'),
|
||||||
|
backup=member.get('backup', False),
|
||||||
name=member.get('name'),
|
name=member.get('name'),
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -1079,6 +1080,7 @@ class Member(generic.View):
|
|||||||
monitor_address=monitor_address if monitor_address else None,
|
monitor_address=monitor_address if monitor_address else None,
|
||||||
monitor_port=data.get('monitor_port'),
|
monitor_port=data.get('monitor_port'),
|
||||||
admin_state_up=data.get('admin_state_up'),
|
admin_state_up=data.get('admin_state_up'),
|
||||||
|
backup=data.get('backup', False),
|
||||||
name=data.get('name'),
|
name=data.get('name'),
|
||||||
)
|
)
|
||||||
return _get_sdk_object_dict(member)
|
return _get_sdk_object_dict(member)
|
||||||
|
@ -64,6 +64,7 @@
|
|||||||
ctrl.monitor_address = member.monitor_address;
|
ctrl.monitor_address = member.monitor_address;
|
||||||
ctrl.monitor_port = member.monitor_port;
|
ctrl.monitor_port = member.monitor_port;
|
||||||
ctrl.admin_state_up = member.admin_state_up;
|
ctrl.admin_state_up = member.admin_state_up;
|
||||||
|
ctrl.backup = member.backup;
|
||||||
ctrl.name = member.name;
|
ctrl.name = member.name;
|
||||||
ctrl.cancel = cancel;
|
ctrl.cancel = cancel;
|
||||||
ctrl.save = save;
|
ctrl.save = save;
|
||||||
@ -81,6 +82,7 @@
|
|||||||
monitor_address: ctrl.monitor_address,
|
monitor_address: ctrl.monitor_address,
|
||||||
monitor_port: ctrl.monitor_port,
|
monitor_port: ctrl.monitor_port,
|
||||||
admin_state_up: ctrl.admin_state_up,
|
admin_state_up: ctrl.admin_state_up,
|
||||||
|
backup: ctrl.backup,
|
||||||
name: ctrl.name
|
name: ctrl.name
|
||||||
}).then(onSuccess, onFailure);
|
}).then(onSuccess, onFailure);
|
||||||
}
|
}
|
||||||
|
@ -43,6 +43,7 @@
|
|||||||
monitor_address: '1.1.1.1',
|
monitor_address: '1.1.1.1',
|
||||||
monitor_port: 80,
|
monitor_port: 80,
|
||||||
admin_state_up: true,
|
admin_state_up: true,
|
||||||
|
backup: false,
|
||||||
name: 'member name'
|
name: 'member name'
|
||||||
});
|
});
|
||||||
$provide.value('horizon.app.core.openstack-service-api.lbaasv2', {
|
$provide.value('horizon.app.core.openstack-service-api.lbaasv2', {
|
||||||
@ -86,6 +87,7 @@
|
|||||||
monitor_address: '1.1.1.1',
|
monitor_address: '1.1.1.1',
|
||||||
monitor_port: 80,
|
monitor_port: 80,
|
||||||
admin_state_up: true,
|
admin_state_up: true,
|
||||||
|
backup: false,
|
||||||
name: 'member name'
|
name: 'member name'
|
||||||
});
|
});
|
||||||
expect($uibModalInstance.close).toHaveBeenCalled();
|
expect($uibModalInstance.close).toHaveBeenCalled();
|
||||||
|
@ -101,6 +101,19 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-xs-12 col-sm-8 col-md-4">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="control-label required" translate>Backup</label>
|
||||||
|
<div class="form-field">
|
||||||
|
<div class="btn-group">
|
||||||
|
<label class="btn btn-default"
|
||||||
|
ng-repeat="option in modal.yesNoOptions"
|
||||||
|
ng-model="modal.backup"
|
||||||
|
uib-btn-radio="option.value">{$ ::option.label $}</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
@ -20,6 +20,10 @@
|
|||||||
<strong translate>Port</strong>
|
<strong translate>Port</strong>
|
||||||
{$ ::ctrl.member.protocol_port $}
|
{$ ::ctrl.member.protocol_port $}
|
||||||
</li>
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong translate>Backup</strong>
|
||||||
|
{$ ctrl.member.backup | yesno $}
|
||||||
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<strong translate>Operating Status</strong>
|
<strong translate>Operating Status</strong>
|
||||||
{$ ctrl.member.operating_status | decode:ctrl.operatingStatus $}
|
{$ ctrl.member.operating_status | decode:ctrl.operatingStatus $}
|
||||||
|
@ -78,6 +78,10 @@
|
|||||||
id: 'weight',
|
id: 'weight',
|
||||||
priority: 1
|
priority: 1
|
||||||
})
|
})
|
||||||
|
.append({
|
||||||
|
id: 'backup',
|
||||||
|
priority: 1
|
||||||
|
})
|
||||||
.append({
|
.append({
|
||||||
id: 'operating_status',
|
id: 'operating_status',
|
||||||
priority: 1
|
priority: 1
|
||||||
@ -148,6 +152,10 @@
|
|||||||
label: gettext('Admin State Up'),
|
label: gettext('Admin State Up'),
|
||||||
filters: ['yesno']
|
filters: ['yesno']
|
||||||
},
|
},
|
||||||
|
backup: {
|
||||||
|
label: gettext('Backup'),
|
||||||
|
filters: ['yesno']
|
||||||
|
},
|
||||||
address: gettext('IP Address'),
|
address: gettext('IP Address'),
|
||||||
protocol_port: gettext('Port'),
|
protocol_port: gettext('Port'),
|
||||||
weight: gettext('Weight'),
|
weight: gettext('Weight'),
|
||||||
|
@ -119,6 +119,7 @@
|
|||||||
monitor_address: null,
|
monitor_address: null,
|
||||||
monitor_port: null,
|
monitor_port: null,
|
||||||
admin_state_up: true,
|
admin_state_up: true,
|
||||||
|
backup: false,
|
||||||
name: null
|
name: null
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -48,3 +48,10 @@
|
|||||||
Default is null which monitors the member protocol port.
|
Default is null which monitors the member protocol port.
|
||||||
</translate>
|
</translate>
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong translate>Backup:</strong>
|
||||||
|
<translate>
|
||||||
|
Is the member a backup? Backup members only receive traffic when all
|
||||||
|
non-backup members are down.
|
||||||
|
</translate>
|
||||||
|
</p>
|
||||||
|
@ -112,7 +112,7 @@
|
|||||||
Can be toggled using the chevron button.
|
Can be toggled using the chevron button.
|
||||||
Ensure colspan is greater or equal to number of column-headers.
|
Ensure colspan is greater or equal to number of column-headers.
|
||||||
-->
|
-->
|
||||||
<td class="detail" colspan="9">
|
<td class="detail" colspan="10">
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<dl class="col-lg-5 col-md-5 col-sm-5">
|
<dl class="col-lg-5 col-md-5 col-sm-5">
|
||||||
@ -154,6 +154,20 @@
|
|||||||
</div>
|
</div>
|
||||||
</dd>
|
</dd>
|
||||||
</dl>
|
</dl>
|
||||||
|
<dl class="col-lg-5 col-md-5 col-sm-5">
|
||||||
|
<dt class="control-label required" translate>Backup</dt>
|
||||||
|
<dd class="form-group">
|
||||||
|
<div class="form-field">
|
||||||
|
<div class="btn-group">
|
||||||
|
<label class="btn btn-default"
|
||||||
|
ng-repeat="option in model.yesNoOptions"
|
||||||
|
ng-model="row.backup"
|
||||||
|
ng-disabled="row.allocatedMember"
|
||||||
|
uib-btn-radio="option.value">{$ ::option.label $}</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</dd>
|
||||||
|
</dl>
|
||||||
<dl class="col-lg-5 col-md-5 col-sm-5">
|
<dl class="col-lg-5 col-md-5 col-sm-5">
|
||||||
<dt class="control-label required" translate>Name</dt>
|
<dt class="control-label required" translate>Name</dt>
|
||||||
<dd class="form-group">
|
<dd class="form-group">
|
||||||
@ -171,7 +185,7 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr table-status table="table" column-count="9"></tr>
|
<tr table-status table="table" column-count="10"></tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="6">
|
<td colspan="6">
|
||||||
|
@ -601,7 +601,8 @@
|
|||||||
weight: 1,
|
weight: 1,
|
||||||
monitor_address: null,
|
monitor_address: null,
|
||||||
monitor_port: null,
|
monitor_port: null,
|
||||||
admin_state_up: true
|
admin_state_up: true,
|
||||||
|
backup: false
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -801,6 +802,7 @@
|
|||||||
monitor_address: member.monitor_address,
|
monitor_address: member.monitor_address,
|
||||||
monitor_port: member.monitor_port,
|
monitor_port: member.monitor_port,
|
||||||
admin_state_up: member.admin_state_up,
|
admin_state_up: member.admin_state_up,
|
||||||
|
backup: member.backup,
|
||||||
name: member.name,
|
name: member.name,
|
||||||
allocatedMember: true
|
allocatedMember: true
|
||||||
});
|
});
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Adds the ability to set member as backup.
|
Loading…
x
Reference in New Issue
Block a user