diff options
Diffstat (limited to 'kud/tests/plugin_collection_v2.sh')
| -rwxr-xr-x | kud/tests/plugin_collection_v2.sh | 85 |
1 files changed, 44 insertions, 41 deletions
diff --git a/kud/tests/plugin_collection_v2.sh b/kud/tests/plugin_collection_v2.sh index 068864d7..09dec5c4 100755 --- a/kud/tests/plugin_collection_v2.sh +++ b/kud/tests/plugin_collection_v2.sh @@ -42,7 +42,7 @@ project_description="test_project_description" userData1="user1" userData2="user2" -composite_app_name="test_composite_app" +composite_app_name="test_composite_app_collection" composite_app_description="test_project_description" composite_app_version="test_composite_app_version" app1_helm_path="$CSAR_DIR/$csar_id/collectd.tar.gz" @@ -58,12 +58,19 @@ app2_desc="prometheus_desc" main_composite_profile_name="main_composite_profile" sub_composite_profile_name1="test_composite_profile1" sub_composite_profile_name2="test_composite_profile2" -composite_profile_description="test_composite_profile_description" +main_composite_profile_description="main_composite_profile_description" +sub_composite_profile_description="sub_composite_profile_description" -genericPlacementIntentName1="test_gen_placement_intent1" -genericPlacementIntentName2="test_gen_placement_intent2" +genericPlacementIntentName="test_gen_placement_intent1" genericPlacementIntentDesc="test_gen_placement_intent_desc" logicalCloud="logical_cloud_name" + +appIntentNameForApp1="appIntentForApp1" +appIntentForApp1Desc="AppIntentForApp1Desc" +appIntentNameForApp2="appIntentForApp2" +appIntentForApp2Desc="AppIntentForApp2Desc" +providerName1="aws" +providerName2="azure" clusterName1="edge1" clusterName2="edge2" clusterLabelName1="east-us1" @@ -71,6 +78,9 @@ clusterLabelName2="east-us2" deploymentIntentGroupName="test_deployment_intent_group" deploymentIntentGroupNameDesc="test_deployment_intent_group_desc" +releaseName="test" +intentToBeAddedinDeploymentIntentGroup="name_of_intent_to_be_added_in_deployment_group" +intentToBeAddedinDeploymentIntentGroupDesc="desc_of_intent_to_be_added_in_deployment_group" chart_name="edgex" profile_name="test_profile" @@ -166,7 +176,7 @@ payload="$(cat <<EOF { "metadata":{ "name":"${main_composite_profile_name}", - "description":"${composite_profile_description}", + "description":"${main_composite_profile_description}", "userData1":"${userData1}", "userData2":"${userData2}" } @@ -183,7 +193,7 @@ payload="$(cat <<EOF { "metadata":{ "name":"${sub_composite_profile_name1}", - "description":"${composite_profile_description}", + "description":"${sub_composite_profile_description}", "userData1":"${userData1}", "userData2":"${userData2}" }, @@ -203,7 +213,7 @@ payload="$(cat <<EOF { "metadata":{ "name":"${sub_composite_profile_name2}", - "description":"${composite_profile_description}", + "description":"${sub_composite_profile_description}", "userData1":"${userData1}", "userData2":"${userData2}" }, @@ -224,25 +234,7 @@ print_msg "Registering GenericPlacementIntent for app1" payload="$(cat <<EOF { "metadata":{ - "name":"${genericPlacementIntentName1}", - "description":"${genericPlacementIntentDesc}", - "userData1":"${userData1}", - "userData2":"${userData2}" - }, - "spec":{ - "logical-cloud":"${logicalCloud}" - } -} -EOF -)" -call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/generic-placement-intents" - - -print_msg "Registering GenericPlacementIntent for app2" -payload="$(cat <<EOF -{ - "metadata":{ - "name":"${genericPlacementIntentName2}", + "name":"${genericPlacementIntentName}", "description":"${genericPlacementIntentDesc}", "userData1":"${userData1}", "userData2":"${userData2}" @@ -261,8 +253,8 @@ print_msg "Adding placement intent for app1(collectd)" payload="$(cat <<EOF { "metadata":{ - "name":"${genericPlacementIntentName1}", - "description":"${genericPlacementIntentDesc}", + "name":"${appIntentNameForApp1}", + "description":"${appIntentForApp1Desc}", "userData1":"${userData1}", "userData2":"${userData2}" }, @@ -270,18 +262,21 @@ payload="$(cat <<EOF "app-name":"${app1_name}", "intent":{ "allOf":[ - { + { "provider-name":"${providerName1}", "cluster-name":"${clusterName1}" }, { + "provider-name":"${providerName2}", "cluster-name":"${clusterName2}" }, { "anyOf":[ { + "provider-name":"${providerName1}", "cluster-label-name":"${clusterLabelName1}" }, { + "provider-name":"${providerName2}", "cluster-label-name":"${clusterLabelName2}" } ] @@ -292,14 +287,14 @@ payload="$(cat <<EOF } EOF )" -call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/generic-placement-intents/${genericPlacementIntentName1}/app-intents" +call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/generic-placement-intents/${genericPlacementIntentName}/app-intents" print_msg "Adding placement intent for app2(prometheus)" payload="$(cat <<EOF { "metadata":{ - "name":"${genericPlacementIntentName2}", - "description":"${genericPlacementIntentDesc}", + "name":"${appIntentNameForApp2}", + "description":"${appIntentForApp2Desc}", "userData1":"${userData1}", "userData2":"${userData2}" }, @@ -308,17 +303,21 @@ payload="$(cat <<EOF "intent":{ "allOf":[ { + "provider-name":"${providerName1}", "cluster-name":"${clusterName1}" }, { + "provider-name":"${providerName2}", "cluster-name":"${clusterName2}" }, { "anyOf":[ { + "provider-name":"${providerName1}", "cluster-label-name":"${clusterLabelName1}" }, { + "provider-name":"${providerName2}", "cluster-label-name":"${clusterLabelName2}" } ] @@ -329,7 +328,7 @@ payload="$(cat <<EOF } EOF )" -call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/generic-placement-intents/${genericPlacementIntentName2}/app-intents" +call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/generic-placement-intents/${genericPlacementIntentName}/app-intents" # END: Adding placement intent for each app in the composite app. # BEGIN: Registering DeploymentIntentGroup in the database @@ -344,20 +343,20 @@ payload="$(cat <<EOF }, "spec":{ "profile":"${main_composite_profile_name}", - "version":"${composite_app_version}", + "version":"${releaseName}", "override-values":[ { "app-name":"${app1_name}", "values": { - "imageRepository":"registry.hub.docker.com" + "collectd_prometheus.service.targetPort":"9104" } }, { "app-name":"${app2_name}", "values": { - "imageRepository":"registry.hub.docker.com" + "prometheus.service.nameOfPort":"WebPort9090" } } ] @@ -369,19 +368,18 @@ call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${ # END: Registering DeploymentIntentGroup in the database # BEGIN: Adding intents to an intent group -print_msg "Adding two intents to the intent group" +print_msg "Adding the genericPlacement intent to the deploymentIntent group" payload="$(cat <<EOF { "metadata":{ - "name":"${deploymentIntentGroupName}", - "description":"${deploymentIntentGroupNameDesc}", + "name":"${intentToBeAddedinDeploymentIntentGroup}", + "description":"${intentToBeAddedinDeploymentIntentGroupDesc}", "userData1":"${userData1}", "userData2":"${userData2}" }, "spec":{ "intent":{ - "generic-placement-intent":"${genericPlacementIntentName1}", - "generic-placement-intent":"${genericPlacementIntentName2}" + "generic-placement-intent":"${genericPlacementIntentName}" } } } @@ -390,3 +388,8 @@ EOF call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/deployment-intent-groups/${deploymentIntentGroupName}/intents" # END: Adding intents to an intent group +#BEGIN: Instantiation +print_msg "Getting the sorted templates for each of the apps.." +call_api -d "" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/deployment-intent-groups/${deploymentIntentGroupName}/instantiate" +# END: Instantiation + |