Merge "NSX: change api mapping for Service Cluster to Edge Cluster" into stable/icehouse
This commit is contained in:
commit
3dd1161b90
@ -30,7 +30,7 @@ HTTP_POST = "POST"
|
|||||||
HTTP_DELETE = "DELETE"
|
HTTP_DELETE = "DELETE"
|
||||||
HTTP_PUT = "PUT"
|
HTTP_PUT = "PUT"
|
||||||
|
|
||||||
SERVICECLUSTER_RESOURCE = "service-cluster"
|
SERVICECLUSTER_RESOURCE = "edge-cluster"
|
||||||
LSERVICESNODE_RESOURCE = "lservices-node"
|
LSERVICESNODE_RESOURCE = "lservices-node"
|
||||||
LSERVICESNODEPORT_RESOURCE = "lport/%s" % LSERVICESNODE_RESOURCE
|
LSERVICESNODEPORT_RESOURCE = "lport/%s" % LSERVICESNODE_RESOURCE
|
||||||
SUPPORTED_METADATA_OPTIONS = ['metadata_proxy_shared_secret']
|
SUPPORTED_METADATA_OPTIONS = ['metadata_proxy_shared_secret']
|
||||||
@ -54,7 +54,7 @@ def service_cluster_exists(cluster, svc_cluster_id):
|
|||||||
|
|
||||||
def lsn_for_network_create(cluster, network_id):
|
def lsn_for_network_create(cluster, network_id):
|
||||||
lsn_obj = {
|
lsn_obj = {
|
||||||
"service_cluster_uuid": cluster.default_service_cluster_uuid,
|
"edge_cluster_uuid": cluster.default_service_cluster_uuid,
|
||||||
"tags": utils.get_tags(n_network_id=network_id)
|
"tags": utils.get_tags(n_network_id=network_id)
|
||||||
}
|
}
|
||||||
return do_request(HTTP_POST,
|
return do_request(HTTP_POST,
|
||||||
|
@ -64,7 +64,7 @@ class LSNTestCase(base.BaseTestCase):
|
|||||||
def test_lsn_for_network_create(self):
|
def test_lsn_for_network_create(self):
|
||||||
net_id = "foo_network_id"
|
net_id = "foo_network_id"
|
||||||
tags = utils.get_tags(n_network_id=net_id)
|
tags = utils.get_tags(n_network_id=net_id)
|
||||||
obj = {"service_cluster_uuid": "foo", "tags": tags}
|
obj = {"edge_cluster_uuid": "foo", "tags": tags}
|
||||||
lsnlib.lsn_for_network_create(self.cluster, net_id)
|
lsnlib.lsn_for_network_create(self.cluster, net_id)
|
||||||
self.mock_request.assert_called_once_with(
|
self.mock_request.assert_called_once_with(
|
||||||
"POST", "/ws.v1/lservices-node",
|
"POST", "/ws.v1/lservices-node",
|
||||||
|
Loading…
Reference in New Issue
Block a user