1. user-guide when get the dmsIDs
2. Update 'sol0018' to 'sol018'
No issue ID
Signed-off-by: Zhang Rong(Jon) <rong.zhang@windriver.com>
Change-Id: Id570bb42a4c7f580b4223997a0039ef1bb72818e
:header: "Name", "Located in", "Required", "Type", "Format", "Properties", "Description"
:widths: 20, 15, 10, 10, 10, 20, 30
:header: "Name", "Located in", "Required", "Type", "Format", "Properties", "Description"
:widths: 20, 15, 10, 10, 10, 20, 30
- profile | query | No | string | | | DMS profile: value supports "sol0018"
+ profile | query | No | string | | | DMS profile: value supports "sol018"
deploymentManagerID | path | Yes | string | | | ID of the deployment manager
deploymentManagerID | path | Yes | string | | | ID of the deployment manager
# Get all DMS ID, and print them with command
dmsIDs=$(curl -s -X 'GET' \
# Get all DMS ID, and print them with command
dmsIDs=$(curl -s -X 'GET' \
- 'http://${OAM_IP}:30205/o2ims_infrastructureInventory/v1/deploymentManagers' \
+ "http://${OAM_IP}:30205/o2ims_infrastructureInventory/v1/deploymentManagers" \
-H 'accept: application/json' | jq --raw-output '.[]["deploymentManagerId"]')
for i in $dmsIDs;do echo ${i};done;
-H 'accept: application/json' | jq --raw-output '.[]["deploymentManagerId"]')
for i in $dmsIDs;do echo ${i};done;
CLUSTER_NAME="o2dmsk8s1" # set the cluster name
K8S_SERVER=$(curl -s -X 'GET' \
CLUSTER_NAME="o2dmsk8s1" # set the cluster name
K8S_SERVER=$(curl -s -X 'GET' \
- "http://${OAM_IP}:30205/o2ims_infrastructureInventory/v1/deploymentManagers/${dmsID}?profile=sol0018" \
+ "http://${OAM_IP}:30205/o2ims_infrastructureInventory/v1/deploymentManagers/${dmsID}?profile=sol018" \
-H 'accept: application/json' | jq --raw-output '.["profileData"]["cluster_api_endpoint"]')
K8S_CA_DATA=$(curl -s -X 'GET' \
-H 'accept: application/json' | jq --raw-output '.["profileData"]["cluster_api_endpoint"]')
K8S_CA_DATA=$(curl -s -X 'GET' \
- "http://${OAM_IP}:30205/o2ims_infrastructureInventory/v1/deploymentManagers/${dmsID}?profile=sol0018" \
+ "http://${OAM_IP}:30205/o2ims_infrastructureInventory/v1/deploymentManagers/${dmsID}?profile=sol018" \
-H 'accept: application/json' | jq --raw-output '.["profileData"]["cluster_ca_cert"]')
K8S_USER_NAME=$(curl -s -X 'GET' \
-H 'accept: application/json' | jq --raw-output '.["profileData"]["cluster_ca_cert"]')
K8S_USER_NAME=$(curl -s -X 'GET' \
- "http://${OAM_IP}:30205/o2ims_infrastructureInventory/v1/deploymentManagers/${dmsID}?profile=sol0018" \
+ "http://${OAM_IP}:30205/o2ims_infrastructureInventory/v1/deploymentManagers/${dmsID}?profile=sol018" \
-H 'accept: application/json' | jq --raw-output '.["profileData"]["admin_user"]')
K8S_USER_CLIENT_CERT_DATA=$(curl -s -X 'GET' \
-H 'accept: application/json' | jq --raw-output '.["profileData"]["admin_user"]')
K8S_USER_CLIENT_CERT_DATA=$(curl -s -X 'GET' \
- "http://${OAM_IP}:30205/o2ims_infrastructureInventory/v1/deploymentManagers/${dmsID}?profile=sol0018" \
+ "http://${OAM_IP}:30205/o2ims_infrastructureInventory/v1/deploymentManagers/${dmsID}?profile=sol018" \
-H 'accept: application/json' | jq --raw-output '.["profileData"]["admin_client_cert"]')
K8S_USER_CLIENT_KEY_DATA=$(curl -s -X 'GET' \
-H 'accept: application/json' | jq --raw-output '.["profileData"]["admin_client_cert"]')
K8S_USER_CLIENT_KEY_DATA=$(curl -s -X 'GET' \
- "http://${OAM_IP}:30205/o2ims_infrastructureInventory/v1/deploymentManagers/${dmsID}?profile=sol0018" \
+ "http://${OAM_IP}:30205/o2ims_infrastructureInventory/v1/deploymentManagers/${dmsID}?profile=sol018" \
-H 'accept: application/json' | jq --raw-output '.["profileData"]["admin_client_key"]')
-H 'accept: application/json' | jq --raw-output '.["profileData"]["admin_client_key"]')
# profile_data = result.pop("profile", None)
# result['profileName'] = 'default'
# profile_data = result.pop("profile", None)
# result['profileName'] = 'default'
- # if "sol0018" == profile:
+ # if "sol018" == profile:
# result['profileName'] = profile
# result['profileData'] = profile_data
# elif "file" == profile and result.hasattr("profile"):
# result['profileName'] = profile
# result['profileData'] = profile_data
# elif "file" == profile and result.hasattr("profile"):
# ---------- DeploymentManagers ---------- #
@api_dms_lcm_v1.route("/<deploymentManagerID>")
@api_dms_lcm_v1.param('deploymentManagerID', 'ID of the deployment manager')
# ---------- DeploymentManagers ---------- #
@api_dms_lcm_v1.route("/<deploymentManagerID>")
@api_dms_lcm_v1.param('deploymentManagerID', 'ID of the deployment manager')
-# @api_dms_lcm_v1.param('profile', 'DMS profile: value supports "sol0018"',
-# _in='query', default='sol0018')
+# @api_dms_lcm_v1.param('profile', 'DMS profile: value supports "sol018"',
+# _in='query', default='sol018')
@api_dms_lcm_v1.response(404, 'Deployment manager not found')
class DmsGetRouter(Resource):
@api_dms_lcm_v1.response(404, 'Deployment manager not found')
class DmsGetRouter(Resource):
if 'profile' in d and d['profile'] != '':
d['profile'] = json.loads(d['profile'])
if 'profile' in d and d['profile'] != '':
d['profile'] = json.loads(d['profile'])
- d['profileSupportList'] = ['default', 'sol0018']
+ d['profileSupportList'] = ['default', 'sol018']
@api_ims_inventory_v1.route("/deploymentManagers/<deploymentManagerID>")
@api_ims_inventory_v1.param('deploymentManagerID',
'ID of the deployment manager')
@api_ims_inventory_v1.route("/deploymentManagers/<deploymentManagerID>")
@api_ims_inventory_v1.param('deploymentManagerID',
'ID of the deployment manager')
-@api_ims_inventory_v1.param('profile', 'DMS profile: value supports "sol0018"',
+@api_ims_inventory_v1.param('profile', 'DMS profile: value supports "sol018"',
_in='query')
@api_ims_inventory_v1.response(404, 'Deployment manager not found')
class DeploymentManagerGetRouter(Resource):
_in='query')
@api_ims_inventory_v1.response(404, 'Deployment manager not found')
class DeploymentManagerGetRouter(Resource):
profile_data = result.pop("profile", None)
result['profileName'] = 'default'
profile_data = result.pop("profile", None)
result['profileName'] = 'default'
- if "sol0018" == profile:
+ if "sol018" == profile:
result['profileName'] = profile
result['deploymentManagementServiceEndpoint'] = \
profile_data['cluster_api_endpoint']
result['profileName'] = profile
result['deploymentManagementServiceEndpoint'] = \
profile_data['cluster_api_endpoint']
'deploymentManagementServiceEndpoint')) == dms_endpoint
assert deployment_manager_res.get('profile') is None
'deploymentManagementServiceEndpoint')) == dms_endpoint
assert deployment_manager_res.get('profile') is None
- # profile sol0018
- profileName = 'sol0018'
+ # profile sol018
+ profileName = 'sol018'
cluster_endpoint = "https://test_k8s:6443"
session.return_value.query.return_value.filter_by.return_value.first.\
return_value.serialize.return_value['profile'] = {
cluster_endpoint = "https://test_k8s:6443"
session.return_value.query.return_value.filter_by.return_value.first.\
return_value.serialize.return_value['profile'] = {