diff options
author | 2020-07-02 15:34:13 -0700 | |
---|---|---|
committer | 2020-07-08 14:17:06 -0700 | |
commit | 0af31b5e508faa227a36e687346e7905a7a10ed6 (patch) | |
tree | 3a1f0e7565f8ce699f094167009cc68db7e16ad8 /kud/tests/vfw-test.sh | |
parent | e06b947b03c3fcce2c954feb68890a519c7740c3 (diff) |
Add terminate support to orchestrator and ncm
Complete the basic terminate support for the
orchestrator and ncm services.
1. When terminate REST API is invoked on a deployment
intent group, call the uninstall grpc api to rsync
and then remove the app context.
2. When terminate REST API is invoked on a cluster,
add the uninstall grpc api call to rsync to remove
the network resources from the clusters.
Issue-ID: MULTICLOUD-1040
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Change-Id: I181e891a8c7c973970af061f9ff07d80c3bb64f9
Diffstat (limited to 'kud/tests/vfw-test.sh')
-rwxr-xr-x | kud/tests/vfw-test.sh | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/kud/tests/vfw-test.sh b/kud/tests/vfw-test.sh index 9c431ef0..b14ad95b 100755 --- a/kud/tests/vfw-test.sh +++ b/kud/tests/vfw-test.sh @@ -958,12 +958,23 @@ function applyNcmData { call_api -d "{ }" "${base_url_ncm}/cluster-providers/${clusterprovidername}/clusters/${clustername2}/apply" } -# deletes the appcontext (eventually will terminate from resource synchronizer when that funcationality is ready) +# deletes the network resources from the clusters and the associated appcontext entries function terminateNcmData { call_api -d "{ }" "${base_url_ncm}/cluster-providers/${clusterprovidername}/clusters/${clustername}/terminate" call_api -d "{ }" "${base_url_ncm}/cluster-providers/${clusterprovidername}/clusters/${clustername2}/terminate" } +# terminates the vfw resources +function terminateOrchData { + call_api -d "{ }" "${base_url_orchestrator}/projects/${projectname}/composite-apps/${vfw_compositeapp_name}/${vfw_compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}/terminate" +} + +# terminates the vfw and ncm resources +function terminateVfw { + terminateOrchData + terminateNcmData +} + function instantiateVfw { # call_api -d "{ }" "${base_url_orchestrator}/projects/${projectname}/composite-apps/${vfw_compositeapp_name}/${vfw_compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}/approve" call_api -d "{ }" "${base_url_orchestrator}/projects/${projectname}/composite-apps/${vfw_compositeapp_name}/${vfw_compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}/instantiate" @@ -990,13 +1001,14 @@ function usage { echo " apply - applys the network intents - e.g. networks created in ncm" echo " instantiate - approves and instantiates the composite app via the generic deployment intent" echo " status - get status of deployed resources" - echo " terminate - remove the network inents created by ncm" + echo " terminate - remove the vFW composite app resources and network resources create by 'instantiate' and 'apply'" echo "" echo " a reasonable test sequence:" echo " 1. create" echo " 2. apply" echo " 3. instantiate" echo " 4. status" + echo " 5. terminate" exit } @@ -1053,8 +1065,8 @@ case "$1" in "get" ) getData ;; "delete" ) deleteData ;; "apply" ) applyNcmData ;; - "terminate" ) terminateNcmData ;; "instantiate" ) instantiateVfw ;; + "terminate" ) terminateVfw ;; "status" ) statusVfw ;; *) usage ;; esac |