16b105f7f5
This patch adds multi-manager support to the NSX v3 plugin thereby enabling the ability to specify multiple NSX managers for the v3 plugin. This implementation supports the same basic features as the MH multi-manager support does including; timeouts, retries, keep-alive, etc.. The approach in a nutshell is to introduce a "proxy" class which looks like a requests or requests.Session object and can be used in place of requests in the NSX REST API client. Under the covers this class handles management of endpoint selection and connectivity. Also note that with this patch your devstack local rc / conf no longer needs to specify NSX_CONTROLLERS when using the v3 plugin. Instead a comma list of managers is supported on the NSX_MANAGERS devstack var. Closes-Bug: #1524046 Change-Id: I433a4b9ea73de0680d64d86e2f826c092adfba87
105 lines
3.5 KiB
Python
105 lines
3.5 KiB
Python
# Copyright (c) 2015 VMware, Inc.
|
|
#
|
|
# 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.
|
|
#
|
|
from oslo_log import log
|
|
from oslo_serialization import jsonutils
|
|
|
|
from vmware_nsx.common import nsx_constants
|
|
from vmware_nsx.nsxlib import v3 as nsxlib
|
|
from vmware_nsx.tests.unit.nsx_v3 import mocks as nsx_v3_mocks
|
|
from vmware_nsx.tests.unit.nsxlib.v3 import nsxlib_testcase
|
|
from vmware_nsx.tests.unit.nsxlib.v3 import test_client
|
|
|
|
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
class NsxLibSwitchTestCase(nsxlib_testcase.NsxClientTestCase):
|
|
_tz_id = "8f602f97-ee3e-46b0-9d9f-358955f03608"
|
|
|
|
def _create_body(self, admin_state=nsx_constants.ADMIN_STATE_UP,
|
|
vlan_id=None):
|
|
body = {
|
|
"transport_zone_id": NsxLibSwitchTestCase._tz_id,
|
|
"replication_mode": "MTEP",
|
|
"display_name": "fake_name",
|
|
"tags": [],
|
|
"admin_state": admin_state
|
|
}
|
|
if vlan_id:
|
|
body['vlan'] = vlan_id
|
|
return body
|
|
|
|
def test_create_logical_switch(self):
|
|
"""
|
|
Test creating a switch returns the correct response and 200 status
|
|
"""
|
|
api = self.mocked_rest_fns(nsxlib, 'client')
|
|
|
|
nsxlib.create_logical_switch(
|
|
nsx_v3_mocks.FAKE_NAME, NsxLibSwitchTestCase._tz_id, [])
|
|
|
|
test_client.assert_json_call(
|
|
'post', api,
|
|
'https://1.2.3.4/api/v1/logical-switches',
|
|
data=jsonutils.dumps(self._create_body(), sort_keys=True))
|
|
|
|
def test_create_logical_switch_admin_down(self):
|
|
"""
|
|
Test creating switch with admin_state down
|
|
"""
|
|
api = self.mocked_rest_fns(nsxlib, 'client')
|
|
|
|
nsxlib.create_logical_switch(
|
|
nsx_v3_mocks.FAKE_NAME, NsxLibSwitchTestCase._tz_id,
|
|
[], admin_state=False)
|
|
|
|
test_client.assert_json_call(
|
|
'post', api,
|
|
'https://1.2.3.4/api/v1/logical-switches',
|
|
data=jsonutils.dumps(self._create_body(
|
|
admin_state=nsx_constants.ADMIN_STATE_DOWN),
|
|
sort_keys=True))
|
|
|
|
def test_create_logical_switch_vlan(self):
|
|
"""
|
|
Test creating switch with provider:network_type VLAN
|
|
"""
|
|
api = self.mocked_rest_fns(nsxlib, 'client')
|
|
|
|
nsxlib.create_logical_switch(
|
|
nsx_v3_mocks.FAKE_NAME, NsxLibSwitchTestCase._tz_id,
|
|
[], vlan_id='123')
|
|
|
|
test_client.assert_json_call(
|
|
'post', api,
|
|
'https://1.2.3.4/api/v1/logical-switches',
|
|
data=jsonutils.dumps(self._create_body(vlan_id='123'),
|
|
sort_keys=True))
|
|
|
|
def test_delete_logical_switch(self):
|
|
"""
|
|
Test deleting switch
|
|
"""
|
|
api = self.mocked_rest_fns(nsxlib, 'client')
|
|
|
|
fake_switch = nsx_v3_mocks.make_fake_switch()
|
|
nsxlib.delete_logical_switch(fake_switch['id'])
|
|
|
|
test_client.assert_json_call(
|
|
'delete', api,
|
|
'https://1.2.3.4/api/v1/logical-switches/%s'
|
|
'?detach=true&cascade=true' % fake_switch['id'])
|