diff --git a/go.mod b/go.mod index ce443e435..0b8a3b66d 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,6 @@ require ( github.com/snowzach/rotatefilehook v0.0.0-20180327172521-2f64f265f58c // indirect github.com/spf13/cobra v1.0.0 github.com/spf13/viper v1.7.0 - github.com/stretchr/objx v0.1.1 // indirect github.com/valyala/fasttemplate v1.1.0 // indirect github.com/xujiajun/nutsdb v0.5.1-0.20200320023740-0cc84000d103 // indirect go.etcd.io/etcd v3.3.21+incompatible // indirect diff --git a/src/mcism.go b/src/mcism.go index 8cb6b9813..a6acb34d5 100644 --- a/src/mcism.go +++ b/src/mcism.go @@ -39,7 +39,7 @@ func main() { //masterConfigInfos = confighandler.GetMasterConfigInfos() //Ticker for MCIS status validation - validationDuration := 2000 //ms + validationDuration := 60000 //ms ticker := time.NewTicker( time.Millisecond * time.Duration(validationDuration) ) go func() { for t := range ticker.C { diff --git a/test/2020-04-29/prettify-json.sh b/test/2020-04-29/prettify-json.sh deleted file mode 100755 index 0d4aa5c26..000000000 --- a/test/2020-04-29/prettify-json.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -STR=${1} - -echo $STR | json_pp -echo "| json_pp" diff --git a/test/2020-04-29/aws-test.sh b/test/obsolete/aws-test.sh similarity index 100% rename from test/2020-04-29/aws-test.sh rename to test/obsolete/aws-test.sh diff --git a/test/2020-04-29/azure-test.sh b/test/obsolete/azure-test.sh similarity index 100% rename from test/2020-04-29/azure-test.sh rename to test/obsolete/azure-test.sh diff --git a/test/2020-04-29/clear-tools/1.aws-delete.sh b/test/obsolete/clear-tools/1.aws-delete.sh similarity index 100% rename from test/2020-04-29/clear-tools/1.aws-delete.sh rename to test/obsolete/clear-tools/1.aws-delete.sh diff --git a/test/2020-04-29/clear-tools/2.azure-test.sh b/test/obsolete/clear-tools/2.azure-test.sh similarity index 100% rename from test/2020-04-29/clear-tools/2.azure-test.sh rename to test/obsolete/clear-tools/2.azure-test.sh diff --git a/test/2020-04-29/clear-tools/4.gcp-test.sh b/test/obsolete/clear-tools/4.gcp-test.sh similarity index 100% rename from test/2020-04-29/clear-tools/4.gcp-test.sh rename to test/obsolete/clear-tools/4.gcp-test.sh diff --git a/test/2020-04-29/clear-tools/all_delete.sh b/test/obsolete/clear-tools/all_delete.sh similarity index 100% rename from test/2020-04-29/clear-tools/all_delete.sh rename to test/obsolete/clear-tools/all_delete.sh diff --git a/test/2020-04-29/full_test.sh b/test/obsolete/full_test.sh similarity index 100% rename from test/2020-04-29/full_test.sh rename to test/obsolete/full_test.sh diff --git a/test/2020-04-29/gcp-test.sh b/test/obsolete/gcp-test.sh similarity index 100% rename from test/2020-04-29/gcp-test.sh rename to test/obsolete/gcp-test.sh diff --git a/test/2020-04-29/openstack-test.sh b/test/obsolete/openstack-test.sh similarity index 100% rename from test/2020-04-29/openstack-test.sh rename to test/obsolete/openstack-test.sh diff --git a/test/2020-04-29/0.settingSpider/get-cloud.sh b/test/official/0.settingSpider/get-cloud.sh similarity index 100% rename from test/2020-04-29/0.settingSpider/get-cloud.sh rename to test/official/0.settingSpider/get-cloud.sh diff --git a/test/2020-04-29/0.settingSpider/list-cloud.sh b/test/official/0.settingSpider/list-cloud.sh similarity index 100% rename from test/2020-04-29/0.settingSpider/list-cloud.sh rename to test/official/0.settingSpider/list-cloud.sh diff --git a/test/2020-04-29/0.settingSpider/register-cloud.sh b/test/official/0.settingSpider/register-cloud.sh similarity index 100% rename from test/2020-04-29/0.settingSpider/register-cloud.sh rename to test/official/0.settingSpider/register-cloud.sh diff --git a/test/2020-04-29/0.settingSpider/unregister-cloud.sh b/test/official/0.settingSpider/unregister-cloud.sh similarity index 100% rename from test/2020-04-29/0.settingSpider/unregister-cloud.sh rename to test/official/0.settingSpider/unregister-cloud.sh diff --git a/test/2020-04-29/0.settingTB/create-ns.sh b/test/official/0.settingTB/create-ns.sh similarity index 100% rename from test/2020-04-29/0.settingTB/create-ns.sh rename to test/official/0.settingTB/create-ns.sh diff --git a/test/2020-04-29/0.settingTB/delete-ns.sh b/test/official/0.settingTB/delete-ns.sh similarity index 100% rename from test/2020-04-29/0.settingTB/delete-ns.sh rename to test/official/0.settingTB/delete-ns.sh diff --git a/test/2020-04-29/0.settingTB/get-ns.sh b/test/official/0.settingTB/get-ns.sh similarity index 100% rename from test/2020-04-29/0.settingTB/get-ns.sh rename to test/official/0.settingTB/get-ns.sh diff --git a/test/2020-04-29/0.settingTB/list-ns.sh b/test/official/0.settingTB/list-ns.sh similarity index 100% rename from test/2020-04-29/0.settingTB/list-ns.sh rename to test/official/0.settingTB/list-ns.sh diff --git a/test/2020-04-29/1.vNet/create-vNet.sh b/test/official/1.vNet/create-vNet.sh similarity index 100% rename from test/2020-04-29/1.vNet/create-vNet.sh rename to test/official/1.vNet/create-vNet.sh diff --git a/test/2020-04-29/1.vNet/delete-vNet.sh b/test/official/1.vNet/delete-vNet.sh similarity index 100% rename from test/2020-04-29/1.vNet/delete-vNet.sh rename to test/official/1.vNet/delete-vNet.sh diff --git a/test/2020-04-29/1.vNet/get-vNet.sh b/test/official/1.vNet/get-vNet.sh similarity index 100% rename from test/2020-04-29/1.vNet/get-vNet.sh rename to test/official/1.vNet/get-vNet.sh diff --git a/test/2020-04-29/1.vNet/list-vNet.sh b/test/official/1.vNet/list-vNet.sh similarity index 100% rename from test/2020-04-29/1.vNet/list-vNet.sh rename to test/official/1.vNet/list-vNet.sh diff --git a/test/2020-04-29/1.vNet/spider-get-vNet.sh b/test/official/1.vNet/spider-get-vNet.sh similarity index 100% rename from test/2020-04-29/1.vNet/spider-get-vNet.sh rename to test/official/1.vNet/spider-get-vNet.sh diff --git a/test/2020-04-29/2.securityGroup/create-securityGroup.sh b/test/official/2.securityGroup/create-securityGroup.sh similarity index 100% rename from test/2020-04-29/2.securityGroup/create-securityGroup.sh rename to test/official/2.securityGroup/create-securityGroup.sh diff --git a/test/2020-04-29/2.securityGroup/delete-securityGroup.sh b/test/official/2.securityGroup/delete-securityGroup.sh similarity index 100% rename from test/2020-04-29/2.securityGroup/delete-securityGroup.sh rename to test/official/2.securityGroup/delete-securityGroup.sh diff --git a/test/2020-04-29/2.securityGroup/get-securityGroup.sh b/test/official/2.securityGroup/get-securityGroup.sh similarity index 100% rename from test/2020-04-29/2.securityGroup/get-securityGroup.sh rename to test/official/2.securityGroup/get-securityGroup.sh diff --git a/test/2020-04-29/2.securityGroup/list-securityGroup.sh b/test/official/2.securityGroup/list-securityGroup.sh similarity index 100% rename from test/2020-04-29/2.securityGroup/list-securityGroup.sh rename to test/official/2.securityGroup/list-securityGroup.sh diff --git a/test/2020-04-29/2.securityGroup/spider-get-securityGroup.sh b/test/official/2.securityGroup/spider-get-securityGroup.sh similarity index 100% rename from test/2020-04-29/2.securityGroup/spider-get-securityGroup.sh rename to test/official/2.securityGroup/spider-get-securityGroup.sh diff --git a/test/2020-04-29/3.sshKey/create-sshKey.sh b/test/official/3.sshKey/create-sshKey.sh similarity index 100% rename from test/2020-04-29/3.sshKey/create-sshKey.sh rename to test/official/3.sshKey/create-sshKey.sh diff --git a/test/2020-04-29/3.sshKey/delete-sshKey.sh b/test/official/3.sshKey/delete-sshKey.sh similarity index 100% rename from test/2020-04-29/3.sshKey/delete-sshKey.sh rename to test/official/3.sshKey/delete-sshKey.sh diff --git a/test/2020-04-29/3.sshKey/get-sshKey.sh b/test/official/3.sshKey/get-sshKey.sh similarity index 100% rename from test/2020-04-29/3.sshKey/get-sshKey.sh rename to test/official/3.sshKey/get-sshKey.sh diff --git a/test/2020-04-29/3.sshKey/list-sshKey.sh b/test/official/3.sshKey/list-sshKey.sh similarity index 100% rename from test/2020-04-29/3.sshKey/list-sshKey.sh rename to test/official/3.sshKey/list-sshKey.sh diff --git a/test/2020-04-29/3.sshKey/spider-delete-sshKey.sh b/test/official/3.sshKey/spider-delete-sshKey.sh similarity index 100% rename from test/2020-04-29/3.sshKey/spider-delete-sshKey.sh rename to test/official/3.sshKey/spider-delete-sshKey.sh diff --git a/test/2020-04-29/3.sshKey/spider-get-sshKey.sh b/test/official/3.sshKey/spider-get-sshKey.sh similarity index 100% rename from test/2020-04-29/3.sshKey/spider-get-sshKey.sh rename to test/official/3.sshKey/spider-get-sshKey.sh diff --git a/test/2020-04-29/4.image/get-image.sh b/test/official/4.image/get-image.sh similarity index 100% rename from test/2020-04-29/4.image/get-image.sh rename to test/official/4.image/get-image.sh diff --git a/test/2020-04-29/4.image/list-image.sh b/test/official/4.image/list-image.sh similarity index 100% rename from test/2020-04-29/4.image/list-image.sh rename to test/official/4.image/list-image.sh diff --git a/test/2020-04-29/4.image/register-image.sh b/test/official/4.image/register-image.sh similarity index 100% rename from test/2020-04-29/4.image/register-image.sh rename to test/official/4.image/register-image.sh diff --git a/test/2020-04-29/4.image/unregister-image.sh b/test/official/4.image/unregister-image.sh similarity index 100% rename from test/2020-04-29/4.image/unregister-image.sh rename to test/official/4.image/unregister-image.sh diff --git a/test/2020-04-29/5.spec/fetch-specs.sh b/test/official/5.spec/fetch-specs.sh similarity index 100% rename from test/2020-04-29/5.spec/fetch-specs.sh rename to test/official/5.spec/fetch-specs.sh diff --git a/test/2020-04-29/5.spec/get-spec.sh b/test/official/5.spec/get-spec.sh similarity index 100% rename from test/2020-04-29/5.spec/get-spec.sh rename to test/official/5.spec/get-spec.sh diff --git a/test/2020-04-29/5.spec/list-spec.sh b/test/official/5.spec/list-spec.sh similarity index 100% rename from test/2020-04-29/5.spec/list-spec.sh rename to test/official/5.spec/list-spec.sh diff --git a/test/2020-04-29/5.spec/lookupSpec.sh b/test/official/5.spec/lookupSpec.sh similarity index 100% rename from test/2020-04-29/5.spec/lookupSpec.sh rename to test/official/5.spec/lookupSpec.sh diff --git a/test/2020-04-29/5.spec/lookupSpecList.sh b/test/official/5.spec/lookupSpecList.sh similarity index 100% rename from test/2020-04-29/5.spec/lookupSpecList.sh rename to test/official/5.spec/lookupSpecList.sh diff --git a/test/2020-04-29/5.spec/register-spec.sh b/test/official/5.spec/register-spec.sh similarity index 100% rename from test/2020-04-29/5.spec/register-spec.sh rename to test/official/5.spec/register-spec.sh diff --git a/test/2020-04-29/5.spec/spider-get-spec.sh b/test/official/5.spec/spider-get-spec.sh similarity index 100% rename from test/2020-04-29/5.spec/spider-get-spec.sh rename to test/official/5.spec/spider-get-spec.sh diff --git a/test/2020-04-29/5.spec/spider-get-speclist.sh b/test/official/5.spec/spider-get-speclist.sh similarity index 100% rename from test/2020-04-29/5.spec/spider-get-speclist.sh rename to test/official/5.spec/spider-get-speclist.sh diff --git a/test/2020-04-29/5.spec/unregister-spec.sh b/test/official/5.spec/unregister-spec.sh similarity index 100% rename from test/2020-04-29/5.spec/unregister-spec.sh rename to test/official/5.spec/unregister-spec.sh diff --git a/test/2020-04-29/6.mcis/create-mcis.sh b/test/official/6.mcis/create-mcis.sh similarity index 100% rename from test/2020-04-29/6.mcis/create-mcis.sh rename to test/official/6.mcis/create-mcis.sh diff --git a/test/2020-04-29/6.mcis/get-mcis.sh b/test/official/6.mcis/get-mcis.sh similarity index 100% rename from test/2020-04-29/6.mcis/get-mcis.sh rename to test/official/6.mcis/get-mcis.sh diff --git a/test/2020-04-29/6.mcis/just-terminate-mcis.sh b/test/official/6.mcis/just-terminate-mcis.sh similarity index 100% rename from test/2020-04-29/6.mcis/just-terminate-mcis.sh rename to test/official/6.mcis/just-terminate-mcis.sh diff --git a/test/2020-04-29/6.mcis/list-mcis.sh b/test/official/6.mcis/list-mcis.sh similarity index 100% rename from test/2020-04-29/6.mcis/list-mcis.sh rename to test/official/6.mcis/list-mcis.sh diff --git a/test/2020-04-29/6.mcis/reboot-mcis.sh b/test/official/6.mcis/reboot-mcis.sh similarity index 100% rename from test/2020-04-29/6.mcis/reboot-mcis.sh rename to test/official/6.mcis/reboot-mcis.sh diff --git a/test/2020-04-29/6.mcis/resume-mcis.sh b/test/official/6.mcis/resume-mcis.sh similarity index 100% rename from test/2020-04-29/6.mcis/resume-mcis.sh rename to test/official/6.mcis/resume-mcis.sh diff --git a/test/2020-04-29/6.mcis/spider-create-vm.sh b/test/official/6.mcis/spider-create-vm.sh similarity index 100% rename from test/2020-04-29/6.mcis/spider-create-vm.sh rename to test/official/6.mcis/spider-create-vm.sh diff --git a/test/2020-04-29/6.mcis/spider-delete-vm.sh b/test/official/6.mcis/spider-delete-vm.sh similarity index 100% rename from test/2020-04-29/6.mcis/spider-delete-vm.sh rename to test/official/6.mcis/spider-delete-vm.sh diff --git a/test/2020-04-29/6.mcis/spider-get-vm.sh b/test/official/6.mcis/spider-get-vm.sh similarity index 100% rename from test/2020-04-29/6.mcis/spider-get-vm.sh rename to test/official/6.mcis/spider-get-vm.sh diff --git a/test/2020-04-29/6.mcis/spider-get-vmstatus.sh b/test/official/6.mcis/spider-get-vmstatus.sh similarity index 100% rename from test/2020-04-29/6.mcis/spider-get-vmstatus.sh rename to test/official/6.mcis/spider-get-vmstatus.sh diff --git a/test/2020-04-29/6.mcis/status-mcis.sh b/test/official/6.mcis/status-mcis.sh similarity index 100% rename from test/2020-04-29/6.mcis/status-mcis.sh rename to test/official/6.mcis/status-mcis.sh diff --git a/test/2020-04-29/6.mcis/suspend-mcis.sh b/test/official/6.mcis/suspend-mcis.sh similarity index 100% rename from test/2020-04-29/6.mcis/suspend-mcis.sh rename to test/official/6.mcis/suspend-mcis.sh diff --git a/test/2020-04-29/6.mcis/terminate-and-delete-mcis.sh b/test/official/6.mcis/terminate-and-delete-mcis.sh similarity index 100% rename from test/2020-04-29/6.mcis/terminate-and-delete-mcis.sh rename to test/official/6.mcis/terminate-and-delete-mcis.sh diff --git a/test/2020-04-29/conf.env b/test/official/conf.env similarity index 100% rename from test/2020-04-29/conf.env rename to test/official/conf.env diff --git a/test/2020-04-29/credentials.conf b/test/official/credentials.conf similarity index 98% rename from test/2020-04-29/credentials.conf rename to test/official/credentials.conf index 58c1fc648..7371ef29a 100644 --- a/test/2020-04-29/credentials.conf +++ b/test/official/credentials.conf @@ -1,4 +1,5 @@ -### CSP credential info for auto testing +### CSP credentials for auto testing + ## AWS ProviderName[1]=AWS @@ -6,6 +7,7 @@ DriverLibFileName[1]=aws-driver-v1.0.so DriverName[1]=aws-driver01 CredentialName[1]=aws-credential01 + CredentialKey01[1]=ClientId #Fill in {YOUR-AWS-Credentidal-ID} Ex:SFLEKJEFLJIEIVJOLJSEOIV CredentialVal01[1]=#YOUR-AWS-Credentidal-ID @@ -14,15 +16,19 @@ CredentialKey02[1]=ClientSecret CredentialVal02[1]=#YOUR-AWS-Credentidal-Secret RegionName[1]=aws-region01 + RegionKey01[1]=Region RegionVal01[1]=us-east-1 + + ## Azure ProviderName[2]=AZURE DriverLibFileName[2]=azure-driver-v1.0.so DriverName[2]=azure-driver01 CredentialName[2]=azure-credential01 + CredentialKey01[2]=ClientId #Fill in {YOUR-AZURE-Credentidal-ClientId} Ex:2157868b-4c35-4bak-a23c-ckf05a54a824 CredentialVal01[2]=#YOUR-AZURE-Credentidal-ClientId @@ -37,11 +43,14 @@ CredentialKey04[2]=SubscriptionId CredentialVal04[2]=#YOUR-AZURE-Credentidal-SubscriptionId RegionName[2]=azure-region01 + RegionKey01[2]=location RegionVal01[2]=northeurope RegionKey02[2]=ResourceGroup RegionVal02[2]=etri-tester-rg + + ## GCP ProviderName[3]=GCP DriverLibFileName[3]=gcp-driver-v1.0.so @@ -65,6 +74,5 @@ RegionName[3]=gcp-region01 RegionKey01[3]=Region RegionVal01[3]=asia-east1 - RegionKey02[3]=Zone RegionVal02[3]=asia-east1-a diff --git a/test/2020-04-29/fullTest/cleanAll-mcis-mcir-cloud.sh b/test/official/sequentialFullTest/cleanAll-mcis-mcir-ns-cloud.sh similarity index 100% rename from test/2020-04-29/fullTest/cleanAll-mcis-mcir-cloud.sh rename to test/official/sequentialFullTest/cleanAll-mcis-mcir-ns-cloud.sh diff --git a/test/2020-04-29/fullTest/executionStatus b/test/official/sequentialFullTest/executionStatus similarity index 100% rename from test/2020-04-29/fullTest/executionStatus rename to test/official/sequentialFullTest/executionStatus diff --git a/test/2020-04-29/fullTest/test-cloud.sh b/test/official/sequentialFullTest/test-cloud.sh similarity index 100% rename from test/2020-04-29/fullTest/test-cloud.sh rename to test/official/sequentialFullTest/test-cloud.sh diff --git a/test/2020-04-29/fullTest/test-mcir-ns-cloud.sh b/test/official/sequentialFullTest/test-mcir-ns-cloud.sh similarity index 100% rename from test/2020-04-29/fullTest/test-mcir-ns-cloud.sh rename to test/official/sequentialFullTest/test-mcir-ns-cloud.sh diff --git a/test/2020-04-29/fullTest/test-ns-cloud.sh b/test/official/sequentialFullTest/test-ns-cloud.sh similarity index 100% rename from test/2020-04-29/fullTest/test-ns-cloud.sh rename to test/official/sequentialFullTest/test-ns-cloud.sh diff --git a/test/2020-04-29/fullTest/testAll-mcis-mcir-ns-cloud.sh b/test/official/sequentialFullTest/testAll-mcis-mcir-ns-cloud.sh similarity index 100% rename from test/2020-04-29/fullTest/testAll-mcis-mcir-ns-cloud.sh rename to test/official/sequentialFullTest/testAll-mcis-mcir-ns-cloud.sh