~juju-qa/ubuntu/xenial/juju/2.0-rc2

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/api/migrationmaster/client_test.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
71
71
 
72
72
        modelUUID := utils.MustNewUUID().String()
73
73
        controllerUUID := utils.MustNewUUID().String()
 
74
        controllerTag := names.NewControllerTag(controllerUUID)
74
75
        timestamp := time.Date(2016, 6, 22, 16, 42, 44, 0, time.UTC)
75
76
        apiCaller := apitesting.APICallerFunc(func(_ string, _ int, _, _ string, _, result interface{}) error {
76
77
                out := result.(*params.MasterMigrationStatus)
78
79
                        Spec: params.MigrationSpec{
79
80
                                ModelTag: names.NewModelTag(modelUUID).String(),
80
81
                                TargetInfo: params.MigrationTargetInfo{
81
 
                                        ControllerTag: names.NewModelTag(controllerUUID).String(),
 
82
                                        ControllerTag: controllerTag.String(),
82
83
                                        Addrs:         []string{"2.2.2.2:2"},
83
84
                                        CACert:        "cert",
84
85
                                        AuthTag:       names.NewUserTag("admin").String(),
104
105
                PhaseChangedTime: timestamp,
105
106
                ExternalControl:  true,
106
107
                TargetInfo: migration.TargetInfo{
107
 
                        ControllerTag: names.NewModelTag(controllerUUID),
 
108
                        ControllerTag: controllerTag,
108
109
                        Addrs:         []string{"2.2.2.2:2"},
109
110
                        CACert:        "cert",
110
111
                        AuthTag:       names.NewUserTag("admin"),