Commit ecc7a086 authored by Zuul's avatar Zuul Committed by Gerrit Code Review

Merge "Added UDP support for listener and health-monitor"

parents 3661294f 0e190f92
......@@ -68,6 +68,11 @@
expect(listener.protocol_port).toBeUndefined();
});
it('should update port on protocol change to UDP', function() {
ctrl.protocolChange('UDP');
expect(listener.protocol_port).toBeUndefined();
});
it('should update member ports on protocol change to TERMINATED_HTTPS', function() {
ctrl.protocolChange('TERMINATED_HTTPS');
......@@ -92,6 +97,14 @@
});
});
it('should update member ports on protocol change to UDP', function() {
ctrl.protocolChange('UDP');
scope.model.members.concat(scope.model.spec.members).forEach(function(member) {
expect(member.port).toBeUndefined();
});
});
});
});
})();
......@@ -61,7 +61,7 @@
</div>
<div class="row">
<div class="row" ng-if="model.spec.listener.protocol !== 'UDP'">
<div class="col-xs-12 col-sm-8 col-md-6">
<div class="form-group required">
......@@ -91,7 +91,7 @@
</div>
<div class="row">
<div class="row" ng-if="model.spec.listener.protocol !== 'UDP'">
<div class="col-xs-12 col-sm-8 col-md-6">
<div class="form-group required">
......
......@@ -86,15 +86,15 @@
members: [],
networks: {},
flavors: {},
listenerProtocols: ['HTTP', 'TCP', 'TERMINATED_HTTPS', 'HTTPS'],
listenerProtocols: ['HTTP', 'TCP', 'TERMINATED_HTTPS', 'HTTPS', 'UDP'],
l7policyActions: ['REJECT', 'REDIRECT_TO_URL', 'REDIRECT_TO_POOL'],
l7ruleTypes: ['HOST_NAME', 'PATH', 'FILE_TYPE', 'HEADER', 'COOKIE'],
l7ruleCompareTypes: ['REGEX', 'EQUAL_TO', 'STARTS_WITH', 'ENDS_WITH', 'CONTAINS'],
l7ruleFileTypeCompareTypes: ['REGEX', 'EQUAL_TO'],
poolProtocols: ['HTTP', 'HTTPS', 'PROXY', 'TCP'],
poolProtocols: ['HTTP', 'HTTPS', 'PROXY', 'TCP', 'UDP'],
methods: ['LEAST_CONNECTIONS', 'ROUND_ROBIN', 'SOURCE_IP'],
types: ['SOURCE_IP', 'HTTP_COOKIE', 'APP_COOKIE'],
monitorTypes: ['HTTP', 'HTTPS', 'PING', 'TCP', 'TLS-HELLO'],
monitorTypes: ['HTTP', 'HTTPS', 'PING', 'TCP', 'TLS-HELLO', 'UDP-CONNECT'],
monitorMethods: ['GET', 'HEAD', 'POST', 'PUT', 'DELETE',
'TRACE', 'OPTIONS', 'PATCH', 'CONNECT'],
certificates: [],
......
......@@ -465,7 +465,8 @@
});
it('has array of listener protocols', function() {
expect(model.listenerProtocols).toEqual(['HTTP', 'TCP', 'TERMINATED_HTTPS', 'HTTPS']);
expect(model.listenerProtocols).toEqual(['HTTP', 'TCP', 'TERMINATED_HTTPS', 'HTTPS',
'UDP']);
});
it('has array of pool lb_algorithms', function() {
......@@ -477,7 +478,8 @@
});
it('has array of monitor types', function() {
expect(model.monitorTypes).toEqual(['HTTP', 'HTTPS', 'PING', 'TCP', 'TLS-HELLO']);
expect(model.monitorTypes).toEqual(['HTTP', 'HTTPS', 'PING', 'TCP', 'TLS-HELLO',
'UDP-CONNECT']);
});
it('has array of monitor http_methods', function() {
......@@ -833,7 +835,7 @@
});
it('should initialize listener protocols', function() {
expect(model.listenerProtocols.length).toBe(4);
expect(model.listenerProtocols.length).toBe(5);
expect(model.listenerProtocols.indexOf('TERMINATED_HTTPS')).toBe(2);
});
});
......@@ -884,7 +886,7 @@
});
it('should initialize listener protocols', function() {
expect(model.listenerProtocols.length).toBe(3);
expect(model.listenerProtocols.length).toBe(4);
expect(model.listenerProtocols.indexOf('TERMINATED_HTTPS')).toBe(-1);
});
});
......
......@@ -22,7 +22,7 @@
<p>
<strong translate>Protocol:</strong>
<translate>
The protocol for which this pool and its members listen. A valid value is HTTP, HTTPS, PROXY, or TCP.
The protocol for which this pool and its members listen. A valid value is HTTP, HTTPS, PROXY, TCP or UDP.
</translate>
</p>
<p>
......
......@@ -63,9 +63,13 @@
<translate>Session Persistence</translate>
</label>
<select class="form-control" name="type" id="type"
ng-options="type for type in model.types"
ng-model="model.spec.pool.session_persistence.type">
<option value="">None</option>
<option ng-repeat="type in model.types"
ng-disabled="model.spec.listener.protocol === 'UDP' && type !== 'SOURCE_IP'"
value="{$ type $}">
{$ type $}
</option>
</select>
</div>
</div>
......
---
features:
- |
Added UDP protocol support in listeners and pools, added UDP-CONNECT method
for health-monitor resources.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment