0a3ed1b3ff
Below are some of the improvements madein this patch for the
Openstack APIC fields in Network, Subnet, Router and Address Scope:
1. Added more descriptive help messages for the apic fields.
2. More user friendly approach to handle dictionary and list elements.
3. Removal of some fields from the set commands.
Change-Id: I50ef5bc56241d0036f2fba3e650c63a7d3539808
(cherry picked from commit ed8d9e8206)
75 lines
2.8 KiB
Python
75 lines
2.8 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 mock
|
|
|
|
from gbpclient.gbp.v2_0 import address_scope as address_scope_ext
|
|
from gbpclient.tests.unit import test_cli20
|
|
from openstackclient.network.v2 import address_scope
|
|
from openstackclient.tests.unit.network.v2 import test_address_scope
|
|
|
|
|
|
# Tests for address scope create for APIC extensions
|
|
#
|
|
class TestAddressScopeCreate(
|
|
test_address_scope.TestAddressScope, test_cli20.CLITestV20Base):
|
|
|
|
def setUp(self):
|
|
super(TestAddressScopeCreate, self).setUp()
|
|
self.new_address_scope = (
|
|
test_address_scope.TestCreateAddressScope.new_address_scope)
|
|
self.network.create_address_scope = mock.Mock(
|
|
return_value=self.new_address_scope)
|
|
|
|
self.cmd = address_scope.CreateAddressScope(self.app, self.namespace)
|
|
|
|
def test_create_default_options(self):
|
|
arglist = [
|
|
test_address_scope.TestCreateAddressScope.new_address_scope.name,
|
|
]
|
|
verifylist = [
|
|
('name', self.new_address_scope.name),
|
|
('apic_distinguished_names', None),
|
|
]
|
|
create_ext = address_scope_ext.CreateAddressScopeExtension(
|
|
self.app)
|
|
parsed_args = self.check_parser_ext(
|
|
self.cmd, arglist, verifylist, create_ext)
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
self.network.create_address_scope.assert_called_once_with(**{
|
|
'ip_version': self.new_address_scope.ip_version,
|
|
'name': self.new_address_scope.name,
|
|
})
|
|
|
|
def test_create_all_options(self):
|
|
arglist = [
|
|
self.new_address_scope.name,
|
|
"--apic-distinguished-names", 'VRF=test1',
|
|
]
|
|
verifylist = [
|
|
('name', self.new_address_scope.name),
|
|
('apic_distinguished_names', [{'VRF': 'test1'}]),
|
|
]
|
|
create_ext = address_scope_ext.CreateAddressScopeExtension(
|
|
self.app)
|
|
parsed_args = self.check_parser_ext(
|
|
self.cmd, arglist, verifylist, create_ext)
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
self.network.create_address_scope.assert_called_once_with(**{
|
|
'ip_version': self.new_address_scope.ip_version,
|
|
'apic:distinguished_names': {"VRF": "test1"},
|
|
'name': self.new_address_scope.name,
|
|
})
|