jack77213
/
qingcloud-sdk-go
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Update test to match latest changes 

Signed-off-by: Jingwen Peng <pengsrc@yunify.com>
This commit is contained in:
Jingwen Peng 2017-01-05 22:04:19 +08:00 committed by Aspire
parent ee0075ad77
commit 8e0fdfcc5d
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/main.go
View File

@ -24,7 +24,7 @@ import (
"github.com/DATA-DOG/godog" "github.com/DATA-DOG/godog"
"github.com/yunify/qingcloud-sdk-go/config" "github.com/yunify/qingcloud-sdk-go/config"
"github.com/yunify/qingcloud-sdk-go/service" qc "github.com/yunify/qingcloud-sdk-go/service"
) )
func main() { func main() {
@ -52,7 +52,7 @@ func setUp() {
var err error var err error
var tc *testConfig var tc *testConfig
var c *config.Config var c *config.Config
var qingcloudService *service.QingCloudService var qcService *qc.QingCloudService
type testConfig struct { type testConfig struct {
Zone string `json:"zone" yaml:"zone"` Zone string `json:"zone" yaml:"zone"`
@ -83,8 +83,8 @@ func loadConfig() {
} }
func initQingStorService() { func initQingStorService() {
if qingcloudService == nil { if qcService == nil {
qingcloudService, err = service.Init(c) qcService, err = qc.Init(c)
checkErrorForExit(err) checkErrorForExit(err)
} }
} }

66
test/service.go
View File

@ -24,8 +24,8 @@ import (
"github.com/DATA-DOG/godog" "github.com/DATA-DOG/godog"
"github.com/DATA-DOG/godog/gherkin" "github.com/DATA-DOG/godog/gherkin"
"github.com/yunify/qingcloud-sdk-go/request/errs" qcErrors "github.com/yunify/qingcloud-sdk-go/request/errors"
"github.com/yunify/qingcloud-sdk-go/service" qc "github.com/yunify/qingcloud-sdk-go/service"
) )
// QingCloudServiceFeatureContext provides feature context for QingCloudService. // QingCloudServiceFeatureContext provides feature context for QingCloudService.
@ -59,22 +59,22 @@ func QingCloudServiceFeatureContext(s *godog.Suite) {
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
var instanceService *service.InstanceService var instanceService *qc.InstanceService
var jobService *service.JobService var jobService *qc.JobService
func initializeQingCloudService() error { func initializeQingCloudService() error {
return nil return nil
} }
func theQingCloudServiceIsInitialized() error { func theQingCloudServiceIsInitialized() error {
if qingcloudService == nil { if qcService == nil {
return errors.New("QingCloud service is not initialized") return errors.New("QingCloud service is not initialized")
} }
return nil return nil
} }
func initializeInstanceService() error { func initializeInstanceService() error {
instanceService, err = qingcloudService.Instance(tc.Zone) instanceService, err = qcService.Instance(tc.Zone)
return err return err
} }
@ -86,7 +86,7 @@ func theInstanceServiceIsInitialized() error {
} }
func initializeJobService() error { func initializeJobService() error {
jobService, err = qingcloudService.Job(tc.Zone) jobService, err = qcService.Job(tc.Zone)
return err return err
} }
@ -99,10 +99,10 @@ func theJobServiceIsInitialized() error {
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
var describeZonesOutput *service.DescribeZonesOutput var describeZonesOutput *qc.DescribeZonesOutput
func describeZones() error { func describeZones() error {
describeZonesOutput, err = qingcloudService.DescribeZones(nil) describeZonesOutput, err = qcService.DescribeZones(nil)
return err return err
} }
@ -115,7 +115,7 @@ func describeZonesShouldGetZoneAtLeast(count int) error {
func describeZonesShouldHaveTheZoneIamUsing() error { func describeZonesShouldHaveTheZoneIamUsing() error {
for _, zone := range describeZonesOutput.ZoneSet { for _, zone := range describeZonesOutput.ZoneSet {
if zone.ZoneID == tc.Zone { if qc.StringValue(zone.ZoneID) == tc.Zone {
return nil return nil
} }
} }
@ -125,8 +125,8 @@ func describeZonesShouldHaveTheZoneIamUsing() error {
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
var runInstanceInput *service.RunInstancesInput var runInstanceInput *qc.RunInstancesInput
var runInstanceOutput *service.RunInstancesOutput var runInstanceOutput *qc.RunInstancesOutput
func instanceConfiguration(configuration *gherkin.DataTable) error { func instanceConfiguration(configuration *gherkin.DataTable) error {
count, err := strconv.Atoi(configuration.Rows[1].Cells[2].Value) count, err := strconv.Atoi(configuration.Rows[1].Cells[2].Value)
@ -134,12 +134,12 @@ func instanceConfiguration(configuration *gherkin.DataTable) error {
return err return err
} }
runInstanceInput = &service.RunInstancesInput{ runInstanceInput = &qc.RunInstancesInput{
ImageID: configuration.Rows[1].Cells[0].Value, ImageID: qc.String(configuration.Rows[1].Cells[0].Value),
InstanceType: configuration.Rows[1].Cells[1].Value, InstanceType: qc.String(configuration.Rows[1].Cells[1].Value),
Count: count, Count: qc.Int(count),
LoginMode: configuration.Rows[1].Cells[3].Value, LoginMode: qc.String(configuration.Rows[1].Cells[3].Value),
LoginPasswd: configuration.Rows[1].Cells[4].Value, LoginPasswd: qc.String(configuration.Rows[1].Cells[4].Value),
} }
return nil return nil
} }
@ -150,7 +150,7 @@ func runInstances() error {
} }
func runInstancesShouldGetAJobID() error { func runInstancesShouldGetAJobID() error {
if runInstanceOutput.JobID != "" { if runInstanceOutput.JobID != nil {
return nil return nil
} }
return errors.New("RunInstances don't get a job ID") return errors.New("RunInstances don't get a job ID")
@ -160,14 +160,14 @@ func runInstancesWillBeFinished() error {
retries := 0 retries := 0
for retries < tc.MaxRetries { for retries < tc.MaxRetries {
describeJobOutput, err := jobService.DescribeJobs( describeJobOutput, err := jobService.DescribeJobs(
&service.DescribeJobsInput{ &qc.DescribeJobsInput{
Jobs: []string{runInstanceOutput.JobID}, Jobs: []*string{runInstanceOutput.JobID},
}, },
) )
if err != nil { if err != nil {
return err return err
} }
if describeJobOutput.JobSet[0].Status == "successful" { if qc.StringValue(describeJobOutput.JobSet[0].Status) == "successful" {
return nil return nil
} }
retries++ retries++
@ -178,20 +178,20 @@ func runInstancesWillBeFinished() error {
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
var terminateInstanceOutput *service.TerminateInstancesOutput var terminateInstanceOutput *qc.TerminateInstancesOutput
func terminateInstances() error { func terminateInstances() error {
retries := 0 retries := 0
for retries < tc.MaxRetries { for retries < tc.MaxRetries {
terminateInstanceOutput, err = instanceService.TerminateInstances( terminateInstanceOutput, err = instanceService.TerminateInstances(
&service.TerminateInstancesInput{ &qc.TerminateInstancesInput{
Instances: runInstanceOutput.Instances, Instances: runInstanceOutput.Instances,
}, },
) )
if err != nil { if err != nil {
fmt.Println(err)
switch e := err.(type) { switch e := err.(type) {
case *errs.QingCloudError: case *qcErrors.QingCloudError:
fmt.Println(e)
if e.RetCode != 1400 { if e.RetCode != 1400 {
return e return e
} }
@ -208,7 +208,7 @@ func terminateInstances() error {
} }
func terminateInstancesShouldGetAJobID() error { func terminateInstancesShouldGetAJobID() error {
if terminateInstanceOutput.JobID != "" { if terminateInstanceOutput.JobID != nil {
return nil return nil
} }
return errors.New("TerminateInstances doesn't get a job ID") return errors.New("TerminateInstances doesn't get a job ID")
@ -218,14 +218,14 @@ func terminateInstancesWillBeFinished() error {
retries := 0 retries := 0
for retries < tc.MaxRetries { for retries < tc.MaxRetries {
describeJobOutput, err := jobService.DescribeJobs( describeJobOutput, err := jobService.DescribeJobs(
&service.DescribeJobsInput{ &qc.DescribeJobsInput{
Jobs: []string{terminateInstanceOutput.JobID}, Jobs: []*string{terminateInstanceOutput.JobID},
}, },
) )
if err != nil { if err != nil {
return err return err
} }
if describeJobOutput.JobSet[0].Status == "successful" { if qc.StringValue(describeJobOutput.JobSet[0].Status) == "successful" {
return nil return nil
} }
retries++ retries++
@ -236,7 +236,7 @@ func terminateInstancesWillBeFinished() error {
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
var describeJobOutput *service.DescribeJobsOutput var describeJobOutput *qc.DescribeJobsOutput
func describeJobs() error { func describeJobs() error {
describeJobOutput, err = jobService.DescribeJobs(nil) describeJobOutput, err = jobService.DescribeJobs(nil)
@ -253,10 +253,10 @@ func describeJobsShouldGetJobAtLeast(count int) error {
func describeJobsShouldHaveTheJobsIJustCreated() error { func describeJobsShouldHaveTheJobsIJustCreated() error {
okCount := 0 okCount := 0
for _, job := range describeJobOutput.JobSet { for _, job := range describeJobOutput.JobSet {
if job.JobID == runInstanceOutput.JobID { if qc.StringValue(job.JobID) == qc.StringValue(runInstanceOutput.JobID) {
okCount++ okCount++
} }
if job.JobID == terminateInstanceOutput.JobID { if qc.StringValue(job.JobID) == qc.StringValue(terminateInstanceOutput.JobID) {
okCount++ okCount++
} }
} }