summaryrefslogtreecommitdiffstats
path: root/kud
diff options
context:
space:
mode:
authorRajamohan Raj <rajamohan.raj@intel.com>2020-09-25 03:16:40 +0000
committerEric Multanen <eric.w.multanen@intel.com>2020-10-02 23:40:47 -0700
commitd4b89af411ec7444b554a8b0ddeb7e239fa0fc73 (patch)
tree34938e3e8f5663e9354a05fddd03e62e9c2501b9 /kud
parent49f3d84b1dd20e7504018ee952d81885d5f21796 (diff)
Modify GenericPlacement APIs to include DepIntGrp
Modify the genericPlacementIntent API such that deploymentIntentGroup becomes a mandatory parameter. Issue-ID: MULTICLOUD-1218 Signed-off-by: Rajamohan Raj <rajamohan.raj@intel.com> Change-Id: I33d2eeac5b60228e9c08921c9347b1b6aa3f8d28
Diffstat (limited to 'kud')
-rwxr-xr-xkud/tests/emco.sh26
1 files changed, 12 insertions, 14 deletions
diff --git a/kud/tests/emco.sh b/kud/tests/emco.sh
index 80dc2d5c..2f9f73ae 100755
--- a/kud/tests/emco.sh
+++ b/kud/tests/emco.sh
@@ -247,9 +247,6 @@ generic_placement_intent_data="$(cat <<EOF
"description":"${generic_placement_intent_name}",
"userData1":"${generic_placement_intent_name}",
"userData2":"${generic_placement_intent_name}"
- },
- "spec":{
- "logical-cloud":"unused_logical_cloud"
}
}
EOF
@@ -318,7 +315,8 @@ deployment_intent_group_data="$(cat <<EOF
"spec":{
"profile":"${collection_composite_profile_name}",
"version":"${release}",
- "override-values":[]
+ "override-values":[],
+ "logical-cloud":"unused_logical_cloud"
}
}
EOF
@@ -380,22 +378,22 @@ function createOrchestratorData {
-F "file=@${collectd_profile_file}" \
"${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/composite-profiles/${collection_composite_profile_name}/profiles"
+ print_msg "create the deployment intent group"
+ call_api -d "${deployment_intent_group_data}" \
+ "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/deployment-intent-groups"
+
print_msg "create the generic placement intent"
call_api -d "${generic_placement_intent_data}" \
- "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/generic-placement-intents"
+ "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}/generic-placement-intents"
print_msg "add the prometheus app placement intent to the generic placement intent"
call_api -d "${prometheus_placement_intent_data}" \
- "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/generic-placement-intents/${generic_placement_intent_name}/app-intents"
+ "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}/generic-placement-intents/${generic_placement_intent_name}/app-intents"
print_msg "add the collectd app placement intent to the generic placement intent"
call_api -d "${collectd_placement_intent_data}" \
- "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/generic-placement-intents/${generic_placement_intent_name}/app-intents"
-
+ "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}/generic-placement-intents/${generic_placement_intent_name}/app-intents"
- print_msg "create the deployment intent group"
- call_api -d "${deployment_intent_group_data}" \
- "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/deployment-intent-groups"
call_api -d "${deployment_intents_in_group_data}" \
"${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}/intents"
@@ -411,9 +409,9 @@ function deleteOrchestratorData {
delete_resource_nox "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}"
- delete_resource "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/generic-placement-intents/${generic_placement_intent_name}/app-intents/${prometheus_placement_intent_name}"
- delete_resource "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/generic-placement-intents/${generic_placement_intent_name}/app-intents/${collectd_placement_intent_name}"
- delete_resource "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/generic-placement-intents/${generic_placement_intent_name}"
+ delete_resource "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}/generic-placement-intents/${generic_placement_intent_name}/app-intents/${prometheus_placement_intent_name}"
+ delete_resource "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}/generic-placement-intents/${generic_placement_intent_name}/app-intents/${collectd_placement_intent_name}"
+ delete_resource "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}/generic-placement-intents/${generic_placement_intent_name}"
delete_resource "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/composite-profiles/${collection_composite_profile_name}/profiles/${prometheus_profile_name}"
delete_resource "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/composite-profiles/${collection_composite_profile_name}/profiles/${collectd_profile_name}"