← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/params/params_test.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/apiserver/params/params_test.go
17
17
        "github.com/juju/juju/network"
18
18
        "github.com/juju/juju/state"
19
19
        "github.com/juju/juju/state/multiwatcher"
 
20
        "github.com/juju/juju/status"
20
21
        "github.com/juju/juju/testing"
21
22
)
22
23
 
39
40
        about: "MachineInfo Delta",
40
41
        value: multiwatcher.Delta{
41
42
                Entity: &multiwatcher.MachineInfo{
42
 
                        ModelUUID:               "uuid",
43
 
                        Id:                      "Benji",
44
 
                        InstanceId:              "Shazam",
45
 
                        Status:                  "error",
46
 
                        StatusInfo:              "foo",
 
43
                        ModelUUID:  "uuid",
 
44
                        Id:         "Benji",
 
45
                        InstanceId: "Shazam",
 
46
                        JujuStatus: multiwatcher.StatusInfo{
 
47
                                Current: status.StatusError,
 
48
                                Message: "foo",
 
49
                        },
 
50
                        MachineStatus: multiwatcher.StatusInfo{
 
51
                                Current: status.StatusPending,
 
52
                        },
47
53
                        Life:                    multiwatcher.Life("alive"),
48
54
                        Series:                  "trusty",
49
55
                        SupportedContainers:     []instance.ContainerType{instance.LXC},
52
58
                        HardwareCharacteristics: &instance.HardwareCharacteristics{},
53
59
                },
54
60
        },
55
 
        json: `["machine","change",{"ModelUUID": "uuid", "Id":"Benji","InstanceId":"Shazam","HasVote":false,"WantsVote":false,"Status":"error","StatusInfo":"foo","StatusData":null,"Life":"alive","Series":"trusty","SupportedContainers":["lxc"],"SupportedContainersKnown":false,"Jobs":["JobManageModel"],"Addresses":[],"HardwareCharacteristics":{}}]`,
 
61
        json: `["machine","change",{"ModelUUID":"uuid","Id":"Benji","InstanceId":"Shazam","JujuStatus":{"Err":null,"Current":"error","Message":"foo","Since":null,"Version":"","Data":null},"MachineStatus":{"Err":null,"Current":"pending","Message":"","Since":null,"Version":"","Data":null},"Life":"alive","Series":"trusty","SupportedContainers":["lxc"],"SupportedContainersKnown":false,"HardwareCharacteristics":{},"Jobs":["JobManageModel"],"Addresses":[],"HasVote":false,"WantsVote":false}]`,
56
62
}, {
57
63
        about: "ServiceInfo Delta",
58
64
        value: multiwatcher.Delta{
70
76
                                "foo":   false,
71
77
                        },
72
78
                        Status: multiwatcher.StatusInfo{
73
 
                                Current: multiwatcher.Status("active"),
 
79
                                Current: status.StatusActive,
74
80
                                Message: "all good",
75
81
                        },
76
82
                },
97
103
                        PublicAddress:  "testing.invalid",
98
104
                        PrivateAddress: "10.0.0.1",
99
105
                        MachineId:      "1",
100
 
                        Status:         "error",
101
 
                        StatusInfo:     "foo",
102
106
                        WorkloadStatus: multiwatcher.StatusInfo{
103
 
                                Current: multiwatcher.Status("active"),
 
107
                                Current: status.StatusActive,
104
108
                                Message: "all good",
105
109
                        },
106
 
                        AgentStatus: multiwatcher.StatusInfo{
107
 
                                Current: multiwatcher.Status("idle"),
 
110
                        JujuStatus: multiwatcher.StatusInfo{
 
111
                                Current: status.StatusIdle,
108
112
                        },
109
113
                },
110
114
        },
111
 
        json: `["unit", "change", {"ModelUUID": "uuid", "CharmURL": "cs:~user/precise/wordpress-42", "MachineId": "1", "Series": "precise", "Name": "Benji", "PublicAddress": "testing.invalid", "Service": "Shazam", "PrivateAddress": "10.0.0.1", "Ports": [{"Protocol": "http", "Number": 80}], "PortRanges": [{"FromPort": 80, "ToPort": 80, "Protocol": "http"}], "Status": "error", "StatusInfo": "foo", "StatusData": null, "WorkloadStatus":{"Current":"active", "Message":"all good", "Version": "", "Err": null, "Data": null, "Since": null}, "AgentStatus":{"Current":"idle", "Message":"", "Version": "", "Err": null, "Data": null, "Since": null}, "Subordinate": false}]`,
 
115
        json: `["unit","change",{"ModelUUID":"uuid","Name":"Benji","Service":"Shazam","Series":"precise","CharmURL":"cs:~user/precise/wordpress-42","PublicAddress":"testing.invalid","PrivateAddress":"10.0.0.1","MachineId":"1","Ports":[{"Protocol":"http","Number":80}],"PortRanges":[{"FromPort":80,"ToPort":80,"Protocol":"http"}],"Subordinate":false,"WorkloadStatus":{"Err":null,"Current":"active","Message":"all good","Since":null,"Version":"","Data":null},"JujuStatus":{"Err":null,"Current":"idle","Message":"","Since":null,"Version":"","Data":null}}]`,
112
116
}, {
113
117
        about: "RelationInfo Delta",
114
118
        value: multiwatcher.Delta{