Merge "Add T0 redistribution interfaces"
This commit is contained in:
commit
f835ea3a65
|
@ -1297,6 +1297,72 @@ class LogicalRouterTestCase(BaseTestResource):
|
||||||
def test_get_transportzone_id_from_t1(self):
|
def test_get_transportzone_id_from_t1(self):
|
||||||
self._test_get_transportzone_id(nsx_constants.ROUTER_TYPE_TIER1_DR)
|
self._test_get_transportzone_id(nsx_constants.ROUTER_TYPE_TIER1_DR)
|
||||||
|
|
||||||
|
def test_get_redistribution(self):
|
||||||
|
router = self.get_mocked_resource()
|
||||||
|
router_id = test_constants.FAKE_ROUTER_UUID
|
||||||
|
router.get_redistribution(router_id)
|
||||||
|
test_client.assert_json_call(
|
||||||
|
'get', router,
|
||||||
|
('https://1.2.3.4/api/v1/logical-routers/%s/routing/'
|
||||||
|
'redistribution' % router_id),
|
||||||
|
headers=self.default_headers())
|
||||||
|
|
||||||
|
def test_get_redistribution_rules(self):
|
||||||
|
router = self.get_mocked_resource()
|
||||||
|
router_id = test_constants.FAKE_ROUTER_UUID
|
||||||
|
router.get_redistribution_rules(router_id)
|
||||||
|
test_client.assert_json_call(
|
||||||
|
'get', router,
|
||||||
|
('https://1.2.3.4/api/v1/logical-routers/%s/routing/'
|
||||||
|
'redistribution/rules' % router_id),
|
||||||
|
headers=self.default_headers())
|
||||||
|
|
||||||
|
def test_update_redistribution_rules(self):
|
||||||
|
router = self.get_mocked_resource()
|
||||||
|
router_id = test_constants.FAKE_ROUTER_UUID
|
||||||
|
rules = mock.Mock()
|
||||||
|
with mock.patch.object(router.client, 'get',
|
||||||
|
return_value={}):
|
||||||
|
router.update_redistribution_rules(router_id, rules)
|
||||||
|
test_client.assert_json_call(
|
||||||
|
'put', router,
|
||||||
|
('https://1.2.3.4/api/v1/logical-routers/%s/routing/'
|
||||||
|
'redistribution/rules' % router_id),
|
||||||
|
data=jsonutils.dumps({'rules': rules}),
|
||||||
|
headers=self.default_headers())
|
||||||
|
|
||||||
|
def test_get_bgp_config(self):
|
||||||
|
router = self.get_mocked_resource()
|
||||||
|
router_id = test_constants.FAKE_ROUTER_UUID
|
||||||
|
router.get_bgp_config(router_id)
|
||||||
|
test_client.assert_json_call(
|
||||||
|
'get', router,
|
||||||
|
('https://1.2.3.4/api/v1/logical-routers/%s/routing/bgp' %
|
||||||
|
router_id),
|
||||||
|
headers=self.default_headers())
|
||||||
|
|
||||||
|
def test_get_route_map(self):
|
||||||
|
router = self.get_mocked_resource()
|
||||||
|
router_id = test_constants.FAKE_ROUTER_UUID
|
||||||
|
route_map_id = 'fake_route_map'
|
||||||
|
router.get_route_map(router_id, route_map_id)
|
||||||
|
test_client.assert_json_call(
|
||||||
|
'get', router,
|
||||||
|
('https://1.2.3.4/api/v1/logical-routers/%s/routing/route-maps/%s'
|
||||||
|
% (router_id, route_map_id)),
|
||||||
|
headers=self.default_headers())
|
||||||
|
|
||||||
|
def test_get_ip_prefix_list(self):
|
||||||
|
router = self.get_mocked_resource()
|
||||||
|
router_id = test_constants.FAKE_ROUTER_UUID
|
||||||
|
ip_prefix_list_id = 'fake_ip_prefix_list'
|
||||||
|
router.get_ip_prefix_list(router_id, ip_prefix_list_id)
|
||||||
|
test_client.assert_json_call(
|
||||||
|
'get', router,
|
||||||
|
('https://1.2.3.4/api/v1/logical-routers/%s/routing/'
|
||||||
|
'ip-prefix-lists/%s' % (router_id, ip_prefix_list_id)),
|
||||||
|
headers=self.default_headers())
|
||||||
|
|
||||||
|
|
||||||
class LogicalRouterPortTestCase(BaseTestResource):
|
class LogicalRouterPortTestCase(BaseTestResource):
|
||||||
|
|
||||||
|
|
|
@ -841,6 +841,35 @@ class NsxLibLogicalRouter(utils.NsxLibApiBase):
|
||||||
resource = self.get_path()
|
resource = self.get_path()
|
||||||
return self.client.list(resource)
|
return self.client.list(resource)
|
||||||
|
|
||||||
|
def get_redistribution(self, logical_router_id):
|
||||||
|
resource = ('logical-routers/%s/routing/redistribution' %
|
||||||
|
logical_router_id)
|
||||||
|
return self.client.get(resource)
|
||||||
|
|
||||||
|
def get_redistribution_rules(self, logical_router_id):
|
||||||
|
resource = ('logical-routers/%s/routing/redistribution/rules' %
|
||||||
|
logical_router_id)
|
||||||
|
return self.client.get(resource)
|
||||||
|
|
||||||
|
def update_redistribution_rules(self, logical_router_id, rules):
|
||||||
|
resource = ('logical-routers/%s/routing/redistribution/rules' %
|
||||||
|
logical_router_id)
|
||||||
|
return self._update_resource(resource, {'rules': rules}, retry=True)
|
||||||
|
|
||||||
|
def get_bgp_config(self, logical_router_id):
|
||||||
|
resource = ('logical-routers/%s/routing/bgp' % logical_router_id)
|
||||||
|
return self.client.get(resource)
|
||||||
|
|
||||||
|
def get_route_map(self, logical_router_id, route_map_id):
|
||||||
|
resource = ('logical-routers/%s/routing/route-maps/%s' % (
|
||||||
|
logical_router_id, route_map_id))
|
||||||
|
return self.client.get(resource)
|
||||||
|
|
||||||
|
def get_ip_prefix_list(self, logical_router_id, ip_prefix_list_id):
|
||||||
|
resource = ('logical-routers/%s/routing/ip-prefix-lists/%s' % (
|
||||||
|
logical_router_id, ip_prefix_list_id))
|
||||||
|
return self.client.get(resource)
|
||||||
|
|
||||||
|
|
||||||
class NsxLibEdgeCluster(utils.NsxLibApiBase):
|
class NsxLibEdgeCluster(utils.NsxLibApiBase):
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue