Skip to content
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

Add udp template to virtual_port_templates and changed param names for tcp and udp template #295

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add udp template to virtual_port_templates and changed param names for tcp and udp template #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b6ae02b
Add udp template to virtual_port_templates and changed param names fo…
JLau1596 Sep 18, 2020
c300bda
Fixed line occurding to Pep8
JLau1596 Sep 21, 2020
bdd924b
Fixed else, changed template names, removed TCP from elif
JLau1596 Sep 23, 2020
4d9f73c
Changing unit test
JLau1596 Sep 24, 2020
52cc389
Merge branch 'master' into tcp_udp_template_fix
JLau1596 Sep 25, 2020
d475ad9
Fixing virtual_port to match with Master
JLau1596 Sep 25, 2020
38b1e15
Fixing typo
JLau1596 Sep 25, 2020
21860d5
Matching UT with Master
JLau1596 Sep 25, 2020
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
32 changes: 16 additions & 16 deletions acos_client/tests/unit/v30/test_slb_virtual_port.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ def test_virtual_port_create_with_params(self):
'ha-conn-mirror': 1,
'no-dest-nat': 1,
'conn-limit': 50000,
'tcp_template': 'test_tcp_template',
'template-tcp': 'test_tcp_template',
'template-persist-cookie': 'test_c_pers_template',
'template-persist-source-ip': 'test_s_pers_template',
'udp_template': 'test_udp_template',
'template-udp': 'test_udp_template',
'use-rcv-hop-for-resp': 1
}
}
Expand Down Expand Up @@ -191,10 +191,10 @@ def test_virtual_port_create_with_templates(self, mocked_get):
'port-number': 80,
'protocol': 'http',
'service-group': 'pool1',
'tcp_template': 'test_tcp_template',
'template-tcp': 'test_tcp_template',
'template-persist-cookie': 'test_c_pers_template',
'template-persist-source-ip': 'test_s_pers_template',
'udp_template': 'test_udp_template',
'template-udp': 'test_udp_template',
'template-virtual-port': 'template_vp',
'template-policy': 'template_pl'
}
Expand All @@ -211,10 +211,10 @@ def test_virtual_port_create_with_templates(self, mocked_get):
'port-number': 80,
'protocol': 'http',
'service-group': 'pool1',
'tcp_template': 'test_tcp_template',
'template-tcp': 'test_tcp_template',
'template-persist-cookie': 'test_c_pers_template',
'template-persist-source-ip': 'test_s_pers_template',
'udp_template': 'test_udp_template',
'template-udp': 'test_udp_template',
'template-virtual-port': 'template_vp',
'template-tcp': 'template_tcp',
'template-policy': 'template_pl'
Expand Down Expand Up @@ -267,10 +267,10 @@ def test_virtual_port_create_with_partial_templates(self, mocked_get):
'port-number': 80,
'protocol': 'http',
'service-group': 'pool1',
'tcp_template': 'test_tcp_template',
'template-tcp': 'test_tcp_template',
'template-persist-cookie': 'test_c_pers_template',
'template-persist-source-ip': 'test_s_pers_template',
'udp_template': 'test_udp_template',
'template-udp': 'test_udp_template',
'template-virtual-port': 'template_vp'
}
}
Expand All @@ -286,10 +286,10 @@ def test_virtual_port_create_with_partial_templates(self, mocked_get):
'port-number': 80,
'protocol': 'http',
'service-group': 'pool1',
'tcp_template': 'test_tcp_template',
'template-tcp': 'test_tcp_template',
'template-persist-cookie': 'test_c_pers_template',
'template-persist-source-ip': 'test_s_pers_template',
'udp_template': 'test_udp_template',
'template-udp': 'test_udp_template',
'template-virtual-port': 'template_vp',
'template-tcp': None,
'template-policy': None,
Expand Down Expand Up @@ -342,10 +342,10 @@ def test_virtual_port_update_with_params(self, mocked_get):
'service-group': 'pool1',
'ha-conn-mirror': 1,
'conn-limit': 50000,
'tcp_template': 'test_tcp_template',
'template-tcp': 'test_tcp_template',
'template-persist-cookie': 'test_c_pers_template',
'template-persist-source-ip': 'test_s_pers_template',
'udp_template': 'test_udp_template',
'template-udp': 'test_udp_template',
'use-rcv-hop-for-resp': 1,
}
}
Expand Down Expand Up @@ -399,10 +399,10 @@ def test_virtual_port_update_with_templates(self, mocked_get):
'service-group': 'pool1',
'ha-conn-mirror': 1,
'conn-limit': 50000,
'tcp_template': 'test_tcp_template',
'template-tcp': 'test_tcp_template',
'template-persist-cookie': 'test_c_pers_template',
'template-persist-source-ip': 'test_s_pers_template',
'udp_template': 'test_udp_template',
'template-udp': 'test_udp_template',
'template-virtual-port': 'template_vp'
}
}
Expand All @@ -422,10 +422,10 @@ def test_virtual_port_update_with_templates(self, mocked_get):
'service-group': 'pool1',
'ha-conn-mirror': 1,
'conn-limit': 50000,
'tcp_template': 'test_tcp_template',
'template-tcp': 'test_tcp_template',
'template-persist-cookie': 'test_c_pers_template',
'template-persist-source-ip': 'test_s_pers_template',
'udp_template': 'test_udp_template',
'template-udp': 'test_udp_template',
'template-virtual-port': 'template_vp'
}
}
Expand Down
6 changes: 2 additions & 4 deletions acos_client/v30/slb/virtual_port.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ def _set(
elif virtual_port_templates.get('template-virtual-port-shared'):
params['port']['template-virtual-port-shared'] = virtual_port_templates['template-virtual-port-shared']
params['port']['shared-partition-virtual-port-template'] = True

if protocol in ['http', 'https']:
if virtual_port_templates.get('template-http'):
params['port']['template-http'] = virtual_port_templates['template-http']
Expand All @@ -125,7 +124,6 @@ def _set(
elif virtual_port_templates.get('template-tcp-shared'):
params['port']['template-tcp-shared'] = virtual_port_templates['template-tcp-shared']
params['port']['shared-partition-tcp'] = True

if virtual_port_templates.get('template-policy'):
params['port']['template-policy'] = virtual_port_templates['template-policy']
elif virtual_port_templates.get('template-policy-shared'):
Expand All @@ -142,9 +140,9 @@ def _set(
if source_nat_pool and len(source_nat_pool) > 0:
params['port']['pool'] = source_nat_pool
if tcp_template:
params['port']['tcp_template'] = tcp_template
params['port']['template-tcp'] = tcp_template
Copy link
Contributor

@afrin-chakure-a10 afrin-chakure-a10 Sep 29, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hthompson-a10
This code seems to override LOC 123. Should we allow it? or more conditions needs to be added for preference.

if udp_template:
params['port']['udp_template'] = udp_template
params['port']['template-udp'] = udp_template

server_ssl_tmpl = kwargs.get("template_server_ssl", None)
client_ssl_tmpl = kwargs.get("template_client_ssl")
Expand Down