d90eb26446
With some recent changes, a dictionary argument could be provided
as:
key1,key2,key3
But list arguments had to be space separated:
"x1 x2 x3"
This patch makes this consistent, to always be comma separated. At the
same time backward compatibility is being preserved.
Some other bugs are also getting fixed on account of this clean up:
Closes-bug: 1505452
Closes-bug: 1452155
Closes-bug: 1482310
Closes-bug: 1505343
Closes-bug: 1501659
Closes-bug: 1452156
Closes-bug: 1486725
Closes-bug: 1403192
(cherry picked from commit 3cbbf82073)
(cherry picked from commit f9cad0befa2f995cbb09c164e796772aee9a1180)
Change-Id: I965f5f0166db118beae1e0ba2428e448a418880f
187 lines
7.3 KiB
Python
187 lines
7.3 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
import logging
|
|
import sys
|
|
|
|
from gbpclient.gbp.v2_0 import groupbasedpolicy as gbp
|
|
from gbpclient.tests.unit import test_cli20
|
|
|
|
|
|
class CLITestV20L3PolicyJSON(test_cli20.CLITestV20Base):
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
def setUp(self):
|
|
super(CLITestV20L3PolicyJSON, self).setUp()
|
|
|
|
def test_create_l3_policy_with_mandatory_params(self):
|
|
resource = 'l3_policy'
|
|
cmd = gbp.CreateL3Policy(test_cli20.MyApp(sys.stdout), None)
|
|
name = 'my-name'
|
|
tenant_id = 'my-tenant'
|
|
my_id = 'my-id'
|
|
args = ['--tenant-id', tenant_id,
|
|
name]
|
|
position_names = ['name', ]
|
|
position_values = [name, ]
|
|
self._test_create_resource(resource, cmd, name, my_id, args,
|
|
position_names, position_values,
|
|
tenant_id=tenant_id)
|
|
|
|
def test_create_l3_policy_with_all_params(self):
|
|
"""l3-policy-create with all params."""
|
|
resource = 'l3_policy'
|
|
cmd = gbp.CreateL3Policy(test_cli20.MyApp(sys.stdout), None)
|
|
name = 'myname'
|
|
tenant_id = 'mytenant'
|
|
description = 'My L3 Policy'
|
|
my_id = 'someid'
|
|
ip_version = '4'
|
|
ip_pool = '172.16.0.0/12'
|
|
subnet_prefix_length = '24'
|
|
external_segment = 'seg_uuid1=1.1.1.0:2.2.2.0'
|
|
expected_external_segments = {'seg_uuid1': ['1.1.1.0', '2.2.2.0']}
|
|
routers = 'uuid1,uuid2'
|
|
shared = 'True'
|
|
args = ['--tenant-id', tenant_id,
|
|
'--description', description,
|
|
'--ip-version', ip_version,
|
|
'--ip-pool', ip_pool,
|
|
'--subnet-prefix-length', subnet_prefix_length,
|
|
'--external-segment', external_segment,
|
|
'--routers', routers,
|
|
'--shared', shared,
|
|
name]
|
|
position_names = ['name', ]
|
|
position_values = [name, ]
|
|
self._test_create_resource(resource, cmd, name, my_id, args,
|
|
position_names, position_values,
|
|
tenant_id=tenant_id,
|
|
description=description,
|
|
ip_version=4,
|
|
ip_pool=ip_pool,
|
|
subnet_prefix_length=24,
|
|
routers=['uuid1', 'uuid2'],
|
|
external_segments=
|
|
expected_external_segments, shared=True)
|
|
|
|
def test_create_l3_policy_with_external_segment(self):
|
|
"""l3-policy-create with all params."""
|
|
resource = 'l3_policy'
|
|
cmd = gbp.CreateL3Policy(test_cli20.MyApp(sys.stdout), None)
|
|
name = 'name'
|
|
tenant_id = 'mytenant'
|
|
my_id = 'someid'
|
|
external_segment = 'seg_uuid1'
|
|
expected_external_segments = {'seg_uuid1': []}
|
|
args = ['--tenant-id', tenant_id,
|
|
'--external-segment', external_segment,
|
|
name]
|
|
position_names = ['name', ]
|
|
position_values = [name, ]
|
|
self._test_create_resource(resource, cmd, name, my_id, args,
|
|
position_names, position_values,
|
|
tenant_id=tenant_id,
|
|
external_segments=
|
|
expected_external_segments)
|
|
|
|
def test_list_l3_policies(self):
|
|
resource = 'l3_policies'
|
|
cmd = gbp.ListL3Policy(test_cli20.MyApp(sys.stdout), None)
|
|
self._test_list_resources(resource, cmd, True)
|
|
|
|
def test_show_l3_policy(self):
|
|
resource = 'l3_policy'
|
|
cmd = gbp.ShowL3Policy(test_cli20.MyApp(sys.stdout), None)
|
|
args = ['--fields', 'id', self.test_id]
|
|
self._test_show_resource(resource, cmd, self.test_id, args, ['id'])
|
|
|
|
def test_update_l3_policy(self):
|
|
resource = 'l3_policy'
|
|
cmd = gbp.UpdateL3Policy(test_cli20.MyApp(sys.stdout), None)
|
|
self._test_update_resource(resource, cmd, 'myid',
|
|
['myid', '--name', 'myname',
|
|
'--tags', 'a', 'b'],
|
|
{'name': 'myname', 'tags': ['a', 'b'], })
|
|
|
|
def test_update_l3_policy_with_all_params(self):
|
|
resource = 'l3_policy'
|
|
cmd = gbp.UpdateL3Policy(test_cli20.MyApp(sys.stdout), None)
|
|
name = 'myname'
|
|
description = 'My L3 Policy'
|
|
my_id = 'someid'
|
|
subnet_prefix_length = '24'
|
|
external_segment = 'seg_uuid1=1.1.1.0:2.2.2.0'
|
|
expected_external_segments = {'seg_uuid1': ['1.1.1.0', '2.2.2.0']}
|
|
shared = 'True'
|
|
routers = 'uuid1,uuid2'
|
|
args = ['--name', name,
|
|
'--description', description,
|
|
'--subnet-prefix-length', subnet_prefix_length,
|
|
'--external-segment', external_segment,
|
|
'--routers', routers,
|
|
'--shared', shared,
|
|
my_id]
|
|
params = {
|
|
'name': name,
|
|
'description': description,
|
|
'subnet_prefix_length': 24,
|
|
'external_segments': expected_external_segments,
|
|
'routers': routers,
|
|
'routers': ['uuid1', 'uuid2'],
|
|
'shared': True
|
|
}
|
|
self._test_update_resource(resource, cmd, my_id, args, params)
|
|
|
|
def test_update_l3_policy_unset_external_segment(self):
|
|
resource = 'l3_policy'
|
|
cmd = gbp.UpdateL3Policy(test_cli20.MyApp(sys.stdout), None)
|
|
name = 'myname'
|
|
description = 'My L3 Policy'
|
|
my_id = 'someid'
|
|
subnet_prefix_length = '24'
|
|
external_segment = ''
|
|
expected_external_segments = {}
|
|
args = ['--name', name,
|
|
'--description', description,
|
|
'--subnet-prefix-length', subnet_prefix_length,
|
|
'--external-segment', external_segment,
|
|
my_id]
|
|
params = {
|
|
'name': name,
|
|
'description': description,
|
|
'subnet_prefix_length': 24,
|
|
'external_segments': expected_external_segments,
|
|
}
|
|
self._test_update_resource(resource, cmd, my_id, args, params)
|
|
|
|
def test_update_l3_policy_unset_routers(self):
|
|
resource = 'l3_policy'
|
|
cmd = gbp.UpdateL3Policy(test_cli20.MyApp(sys.stdout), None)
|
|
my_id = 'someid'
|
|
routers = ''
|
|
args = ['--routers', routers,
|
|
my_id]
|
|
params = {
|
|
'routers': [],
|
|
}
|
|
self._test_update_resource(resource, cmd, my_id, args, params)
|
|
|
|
def test_delete_l3_policy_name(self):
|
|
resource = 'l3_policy'
|
|
cmd = gbp.DeleteL3Policy(test_cli20.MyApp(sys.stdout), None)
|
|
my_id = 'my-id'
|
|
args = [my_id]
|
|
self._test_delete_resource(resource, cmd, my_id, args)
|