Merge pull request #152 from seokho-son/dev

Arrange test script files
cloud-barista · May 19, 2020 · 6b29653 · 6b29653
2 parents 6fbad8d + fba0b0a
commit 6b29653
Show file tree

Hide file tree

Showing 70 changed files with 11 additions and 10 deletions.
diff --git 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
@@ -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
diff --git a/test/2020-04-29/aws-test.sh → test/obsolete/aws-test.sh b/test/2020-04-29/aws-test.sh → test/obsolete/aws-test.sh
diff --git a/test/2020-04-29/azure-test.sh → test/obsolete/azure-test.sh b/test/2020-04-29/azure-test.sh → test/obsolete/azure-test.sh
diff --git a/test/2020-04-29/clear-tools/1.aws-delete.sh → test/obsolete/clear-tools/1.aws-delete.sh b/test/2020-04-29/clear-tools/1.aws-delete.sh → test/obsolete/clear-tools/1.aws-delete.sh
diff --git a/test/2020-04-29/clear-tools/2.azure-test.sh → test/obsolete/clear-tools/2.azure-test.sh b/test/2020-04-29/clear-tools/2.azure-test.sh → test/obsolete/clear-tools/2.azure-test.sh
diff --git a/test/2020-04-29/clear-tools/4.gcp-test.sh → test/obsolete/clear-tools/4.gcp-test.sh b/test/2020-04-29/clear-tools/4.gcp-test.sh → test/obsolete/clear-tools/4.gcp-test.sh
diff --git a/test/2020-04-29/clear-tools/all_delete.sh → test/obsolete/clear-tools/all_delete.sh b/test/2020-04-29/clear-tools/all_delete.sh → test/obsolete/clear-tools/all_delete.sh
diff --git a/test/2020-04-29/full_test.sh → test/obsolete/full_test.sh b/test/2020-04-29/full_test.sh → test/obsolete/full_test.sh
diff --git a/test/2020-04-29/gcp-test.sh → test/obsolete/gcp-test.sh b/test/2020-04-29/gcp-test.sh → test/obsolete/gcp-test.sh
diff --git a/test/2020-04-29/openstack-test.sh → test/obsolete/openstack-test.sh b/test/2020-04-29/openstack-test.sh → test/obsolete/openstack-test.sh
diff --git a/test/2020-04-29/0.settingSpider/get-cloud.sh → test/official/0.settingSpider/get-cloud.sh b/test/2020-04-29/0.settingSpider/get-cloud.sh → test/official/0.settingSpider/get-cloud.sh
diff --git a/.../2020-04-29/0.settingSpider/list-cloud.sh → test/official/0.settingSpider/list-cloud.sh b/.../2020-04-29/0.settingSpider/list-cloud.sh → test/official/0.settingSpider/list-cloud.sh
diff --git a/...0-04-29/0.settingSpider/register-cloud.sh → ...fficial/0.settingSpider/register-cloud.sh b/...0-04-29/0.settingSpider/register-cloud.sh → ...fficial/0.settingSpider/register-cloud.sh
diff --git a/...04-29/0.settingSpider/unregister-cloud.sh → ...icial/0.settingSpider/unregister-cloud.sh b/...04-29/0.settingSpider/unregister-cloud.sh → ...icial/0.settingSpider/unregister-cloud.sh
diff --git a/test/2020-04-29/0.settingTB/create-ns.sh → test/official/0.settingTB/create-ns.sh b/test/2020-04-29/0.settingTB/create-ns.sh → test/official/0.settingTB/create-ns.sh
diff --git a/test/2020-04-29/0.settingTB/delete-ns.sh → test/official/0.settingTB/delete-ns.sh b/test/2020-04-29/0.settingTB/delete-ns.sh → test/official/0.settingTB/delete-ns.sh
diff --git a/test/2020-04-29/0.settingTB/get-ns.sh → test/official/0.settingTB/get-ns.sh b/test/2020-04-29/0.settingTB/get-ns.sh → test/official/0.settingTB/get-ns.sh
diff --git a/test/2020-04-29/0.settingTB/list-ns.sh → test/official/0.settingTB/list-ns.sh b/test/2020-04-29/0.settingTB/list-ns.sh → test/official/0.settingTB/list-ns.sh
diff --git a/test/2020-04-29/1.vNet/create-vNet.sh → test/official/1.vNet/create-vNet.sh b/test/2020-04-29/1.vNet/create-vNet.sh → test/official/1.vNet/create-vNet.sh
diff --git a/test/2020-04-29/1.vNet/delete-vNet.sh → test/official/1.vNet/delete-vNet.sh b/test/2020-04-29/1.vNet/delete-vNet.sh → test/official/1.vNet/delete-vNet.sh
diff --git a/test/2020-04-29/1.vNet/get-vNet.sh → test/official/1.vNet/get-vNet.sh b/test/2020-04-29/1.vNet/get-vNet.sh → test/official/1.vNet/get-vNet.sh
diff --git a/test/2020-04-29/1.vNet/list-vNet.sh → test/official/1.vNet/list-vNet.sh b/test/2020-04-29/1.vNet/list-vNet.sh → test/official/1.vNet/list-vNet.sh
diff --git a/test/2020-04-29/1.vNet/spider-get-vNet.sh → test/official/1.vNet/spider-get-vNet.sh b/test/2020-04-29/1.vNet/spider-get-vNet.sh → test/official/1.vNet/spider-get-vNet.sh
diff --git a/...9/2.securityGroup/create-securityGroup.sh → ...l/2.securityGroup/create-securityGroup.sh b/...9/2.securityGroup/create-securityGroup.sh → ...l/2.securityGroup/create-securityGroup.sh
diff --git a/...9/2.securityGroup/delete-securityGroup.sh → ...l/2.securityGroup/delete-securityGroup.sh b/...9/2.securityGroup/delete-securityGroup.sh → ...l/2.securityGroup/delete-securityGroup.sh
diff --git a/...4-29/2.securityGroup/get-securityGroup.sh → ...cial/2.securityGroup/get-securityGroup.sh b/...4-29/2.securityGroup/get-securityGroup.sh → ...cial/2.securityGroup/get-securityGroup.sh
diff --git a/...-29/2.securityGroup/list-securityGroup.sh → ...ial/2.securityGroup/list-securityGroup.sh b/...-29/2.securityGroup/list-securityGroup.sh → ...ial/2.securityGroup/list-securityGroup.sh
diff --git a/...securityGroup/spider-get-securityGroup.sh → ...securityGroup/spider-get-securityGroup.sh b/...securityGroup/spider-get-securityGroup.sh → ...securityGroup/spider-get-securityGroup.sh
diff --git a/test/2020-04-29/3.sshKey/create-sshKey.sh → test/official/3.sshKey/create-sshKey.sh b/test/2020-04-29/3.sshKey/create-sshKey.sh → test/official/3.sshKey/create-sshKey.sh
diff --git a/test/2020-04-29/3.sshKey/delete-sshKey.sh → test/official/3.sshKey/delete-sshKey.sh b/test/2020-04-29/3.sshKey/delete-sshKey.sh → test/official/3.sshKey/delete-sshKey.sh
diff --git a/test/2020-04-29/3.sshKey/get-sshKey.sh → test/official/3.sshKey/get-sshKey.sh b/test/2020-04-29/3.sshKey/get-sshKey.sh → test/official/3.sshKey/get-sshKey.sh
diff --git a/test/2020-04-29/3.sshKey/list-sshKey.sh → test/official/3.sshKey/list-sshKey.sh b/test/2020-04-29/3.sshKey/list-sshKey.sh → test/official/3.sshKey/list-sshKey.sh
diff --git a/...20-04-29/3.sshKey/spider-delete-sshKey.sh → ...official/3.sshKey/spider-delete-sshKey.sh b/...20-04-29/3.sshKey/spider-delete-sshKey.sh → ...official/3.sshKey/spider-delete-sshKey.sh
diff --git a/.../2020-04-29/3.sshKey/spider-get-sshKey.sh → test/official/3.sshKey/spider-get-sshKey.sh b/.../2020-04-29/3.sshKey/spider-get-sshKey.sh → test/official/3.sshKey/spider-get-sshKey.sh
diff --git a/test/2020-04-29/4.image/get-image.sh → test/official/4.image/get-image.sh b/test/2020-04-29/4.image/get-image.sh → test/official/4.image/get-image.sh
diff --git a/test/2020-04-29/4.image/list-image.sh → test/official/4.image/list-image.sh b/test/2020-04-29/4.image/list-image.sh → test/official/4.image/list-image.sh
diff --git a/test/2020-04-29/4.image/register-image.sh → test/official/4.image/register-image.sh b/test/2020-04-29/4.image/register-image.sh → test/official/4.image/register-image.sh
diff --git a/test/2020-04-29/4.image/unregister-image.sh → test/official/4.image/unregister-image.sh b/test/2020-04-29/4.image/unregister-image.sh → test/official/4.image/unregister-image.sh
diff --git a/test/2020-04-29/5.spec/fetch-specs.sh → test/official/5.spec/fetch-specs.sh b/test/2020-04-29/5.spec/fetch-specs.sh → test/official/5.spec/fetch-specs.sh
diff --git a/test/2020-04-29/5.spec/get-spec.sh → test/official/5.spec/get-spec.sh b/test/2020-04-29/5.spec/get-spec.sh → test/official/5.spec/get-spec.sh
diff --git a/test/2020-04-29/5.spec/list-spec.sh → test/official/5.spec/list-spec.sh b/test/2020-04-29/5.spec/list-spec.sh → test/official/5.spec/list-spec.sh
diff --git a/test/2020-04-29/5.spec/lookupSpec.sh → test/official/5.spec/lookupSpec.sh b/test/2020-04-29/5.spec/lookupSpec.sh → test/official/5.spec/lookupSpec.sh
diff --git a/test/2020-04-29/5.spec/lookupSpecList.sh → test/official/5.spec/lookupSpecList.sh b/test/2020-04-29/5.spec/lookupSpecList.sh → test/official/5.spec/lookupSpecList.sh
diff --git a/test/2020-04-29/5.spec/register-spec.sh → test/official/5.spec/register-spec.sh b/test/2020-04-29/5.spec/register-spec.sh → test/official/5.spec/register-spec.sh
diff --git a/test/2020-04-29/5.spec/spider-get-spec.sh → test/official/5.spec/spider-get-spec.sh b/test/2020-04-29/5.spec/spider-get-spec.sh → test/official/5.spec/spider-get-spec.sh
diff --git a/.../2020-04-29/5.spec/spider-get-speclist.sh → test/official/5.spec/spider-get-speclist.sh b/.../2020-04-29/5.spec/spider-get-speclist.sh → test/official/5.spec/spider-get-speclist.sh
diff --git a/test/2020-04-29/5.spec/unregister-spec.sh → test/official/5.spec/unregister-spec.sh b/test/2020-04-29/5.spec/unregister-spec.sh → test/official/5.spec/unregister-spec.sh
diff --git a/test/2020-04-29/6.mcis/create-mcis.sh → test/official/6.mcis/create-mcis.sh b/test/2020-04-29/6.mcis/create-mcis.sh → test/official/6.mcis/create-mcis.sh
diff --git a/test/2020-04-29/6.mcis/get-mcis.sh → test/official/6.mcis/get-mcis.sh b/test/2020-04-29/6.mcis/get-mcis.sh → test/official/6.mcis/get-mcis.sh
diff --git a/.../2020-04-29/6.mcis/just-terminate-mcis.sh → test/official/6.mcis/just-terminate-mcis.sh b/.../2020-04-29/6.mcis/just-terminate-mcis.sh → test/official/6.mcis/just-terminate-mcis.sh
diff --git a/test/2020-04-29/6.mcis/list-mcis.sh → test/official/6.mcis/list-mcis.sh b/test/2020-04-29/6.mcis/list-mcis.sh → test/official/6.mcis/list-mcis.sh
diff --git a/test/2020-04-29/6.mcis/reboot-mcis.sh → test/official/6.mcis/reboot-mcis.sh b/test/2020-04-29/6.mcis/reboot-mcis.sh → test/official/6.mcis/reboot-mcis.sh
diff --git a/test/2020-04-29/6.mcis/resume-mcis.sh → test/official/6.mcis/resume-mcis.sh b/test/2020-04-29/6.mcis/resume-mcis.sh → test/official/6.mcis/resume-mcis.sh
diff --git a/test/2020-04-29/6.mcis/spider-create-vm.sh → test/official/6.mcis/spider-create-vm.sh b/test/2020-04-29/6.mcis/spider-create-vm.sh → test/official/6.mcis/spider-create-vm.sh
diff --git a/test/2020-04-29/6.mcis/spider-delete-vm.sh → test/official/6.mcis/spider-delete-vm.sh b/test/2020-04-29/6.mcis/spider-delete-vm.sh → test/official/6.mcis/spider-delete-vm.sh
diff --git a/test/2020-04-29/6.mcis/spider-get-vm.sh → test/official/6.mcis/spider-get-vm.sh b/test/2020-04-29/6.mcis/spider-get-vm.sh → test/official/6.mcis/spider-get-vm.sh
diff --git a/.../2020-04-29/6.mcis/spider-get-vmstatus.sh → test/official/6.mcis/spider-get-vmstatus.sh b/.../2020-04-29/6.mcis/spider-get-vmstatus.sh → test/official/6.mcis/spider-get-vmstatus.sh
diff --git a/test/2020-04-29/6.mcis/status-mcis.sh → test/official/6.mcis/status-mcis.sh b/test/2020-04-29/6.mcis/status-mcis.sh → test/official/6.mcis/status-mcis.sh
diff --git a/test/2020-04-29/6.mcis/suspend-mcis.sh → test/official/6.mcis/suspend-mcis.sh b/test/2020-04-29/6.mcis/suspend-mcis.sh → test/official/6.mcis/suspend-mcis.sh
diff --git a/...04-29/6.mcis/terminate-and-delete-mcis.sh → ...icial/6.mcis/terminate-and-delete-mcis.sh b/...04-29/6.mcis/terminate-and-delete-mcis.sh → ...icial/6.mcis/terminate-and-delete-mcis.sh
diff --git a/test/2020-04-29/conf.env → test/official/conf.env b/test/2020-04-29/conf.env → test/official/conf.env
diff --git a/test/2020-04-29/credentials.conf → test/official/credentials.conf b/test/2020-04-29/credentials.conf → test/official/credentials.conf
@@ -1,11 +1,13 @@
-### CSP credential info for auto testing
+### CSP credentials for auto testing
+
 
 ## AWS
 ProviderName[1]=AWS
 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/...4-29/fullTest/cleanAll-mcis-mcir-cloud.sh → ...alFullTest/cleanAll-mcis-mcir-ns-cloud.sh b/...4-29/fullTest/cleanAll-mcis-mcir-cloud.sh → ...alFullTest/cleanAll-mcis-mcir-ns-cloud.sh
diff --git a/test/2020-04-29/fullTest/executionStatus → ...ficial/sequentialFullTest/executionStatus b/test/2020-04-29/fullTest/executionStatus → ...ficial/sequentialFullTest/executionStatus
diff --git a/test/2020-04-29/fullTest/test-cloud.sh → ...official/sequentialFullTest/test-cloud.sh b/test/2020-04-29/fullTest/test-cloud.sh → ...official/sequentialFullTest/test-cloud.sh
diff --git a/...2020-04-29/fullTest/test-mcir-ns-cloud.sh → .../sequentialFullTest/test-mcir-ns-cloud.sh b/...2020-04-29/fullTest/test-mcir-ns-cloud.sh → .../sequentialFullTest/test-mcir-ns-cloud.sh
diff --git a/test/2020-04-29/fullTest/test-ns-cloud.sh → ...icial/sequentialFullTest/test-ns-cloud.sh b/test/2020-04-29/fullTest/test-ns-cloud.sh → ...icial/sequentialFullTest/test-ns-cloud.sh
diff --git a/...29/fullTest/testAll-mcis-mcir-ns-cloud.sh → ...ialFullTest/testAll-mcis-mcir-ns-cloud.sh b/...29/fullTest/testAll-mcis-mcir-ns-cloud.sh → ...ialFullTest/testAll-mcis-mcir-ns-cloud.sh