openstack
/
octavia-dashboard
Code Issues Proposed changes

Add the missing protocol for listener 

According to the octavia api:
https://developer.openstack.org/api-ref/load-balancer/v2/#listeners,
there miss the 'HTTPS' protocol.

Change-Id: I1d4857876a151148348ac79d554db2c4c6616559
(cherry picked from commit 25a8013853)
This commit is contained in:
Qian Min Chen 2018-02-08 16:08:07 +08:00 committed by Keith Berger
parent c439cc2def
commit 11b2a903d7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js
View File

@ -85,7 +85,7 @@
visibleResources: [],
subnets: [],
members: [],
listenerProtocols: ['HTTP', 'TCP', 'TERMINATED_HTTPS'],
listenerProtocols: ['HTTP', 'TCP', 'TERMINATED_HTTPS', 'HTTPS'],
methods: ['LEAST_CONNECTIONS', 'ROUND_ROBIN', 'SOURCE_IP'],
types: ['SOURCE_IP', 'HTTP_COOKIE', 'APP_COOKIE'],
monitorTypes: ['HTTP', 'PING', 'TCP'],

6
octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js
View File

@ -344,7 +344,7 @@
});
it('has array of listener protocols', function() {
expect(model.listenerProtocols).toEqual(['HTTP', 'TCP', 'TERMINATED_HTTPS']);
expect(model.listenerProtocols).toEqual(['HTTP', 'TCP', 'TERMINATED_HTTPS', 'HTTPS']);
});
it('has array of pool methods', function() {
@ -590,7 +590,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(2);
});
});
@ -641,7 +641,7 @@
});
it('should initialize listener protocols', function() {
expect(model.listenerProtocols.length).toBe(2);
expect(model.listenerProtocols.length).toBe(3);
expect(model.listenerProtocols.indexOf('TERMINATED_HTTPS')).toBe(-1);
});
});