From 25a8013853df844b2b2a2e631c582b854aa46ce7 Mon Sep 17 00:00:00 2001 From: Qian Min Chen Date: Thu, 8 Feb 2018 16:08:07 +0800 Subject: [PATCH] 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 --- .../dashboard/project/lbaasv2/workflow/model.service.js | 2 +- .../project/lbaasv2/workflow/model.service.spec.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js index e2c27246..b902da01 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js @@ -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'], diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js index 7bbf0cc1..5ab25445 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js @@ -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); }); });