1
=== modified file 'dependencies.tsv'
2
--- dependencies.tsv	2014-01-22 01:37:16 +0000
3
+++ dependencies.tsv	2014-01-24 20:43:20 +0000
4
@@ -6,7 +6,7 @@
5
6
launchpad.net/gocheck	bzr	gustavo@niemeyer.net-20130302024745-6ikofwq2c03h7giu	85
6
launchpad.net/gocheck	bzr	gustavo@niemeyer.net-20130302024745-6ikofwq2c03h7giu	85
6
7
launchpad.net/golxc	bzr	ian.booth@canonical.com-20140116225718-lvoikrb0me6zugin	6
7
launchpad.net/golxc	bzr	ian.booth@canonical.com-20140116225718-lvoikrb0me6zugin	6
7
8
launchpad.net/gomaasapi	bzr	ian.booth@canonical.com-20131017011445-m1hmr0ap14osd7li	47
8
launchpad.net/gomaasapi	bzr	ian.booth@canonical.com-20131017011445-m1hmr0ap14osd7li	47
9
9
launchpad.net/goose	bzr	tarmac-20131223000240-y2igxjt3kznam7vi	114
9
launchpad.net/goose	bzr	tarmac-20140124165235-h9rloooc531udms5	116
10
10
launchpad.net/goyaml	bzr	gustavo@niemeyer.net-20131114120802-abe042syx64z2m7s	50
10
launchpad.net/goyaml	bzr	gustavo@niemeyer.net-20131114120802-abe042syx64z2m7s	50
11
11
launchpad.net/gwacl	bzr	tarmac-20131031081035-b33m6fyrrdiuf408	229
11
launchpad.net/gwacl	bzr	tarmac-20131031081035-b33m6fyrrdiuf408	229
12
12
launchpad.net/loggo	bzr	tim.penhey@canonical.com-20130729043644-ym0cscir1cist4sm	39
12
launchpad.net/loggo	bzr	tim.penhey@canonical.com-20130729043644-ym0cscir1cist4sm	39
13
13
13
14
=== modified file 'provider/openstack/config.go'
15
--- provider/openstack/config.go	2013-12-23 00:46:18 +0000
16
+++ provider/openstack/config.go	2014-01-24 20:43:20 +0000
17
@@ -25,6 +25,7 @@
18
25
	"control-bucket":       schema.String(),
25
	"control-bucket":       schema.String(),
19
26
	"use-floating-ip":      schema.Bool(),
26
	"use-floating-ip":      schema.Bool(),
20
27
	"use-default-secgroup": schema.Bool(),
27
	"use-default-secgroup": schema.Bool(),
21
28
	"network":              schema.String(),
22
28
}
29
}
23
29
var configDefaults = schema.Defaults{
30
var configDefaults = schema.Defaults{
24
30
	"username":             "",
31
	"username":             "",
25
@@ -38,6 +39,7 @@
26
38
	"control-bucket":       "",
39
	"control-bucket":       "",
27
39
	"use-floating-ip":      false,
40
	"use-floating-ip":      false,
28
40
	"use-default-secgroup": false,
41
	"use-default-secgroup": false,
29
42
	"network":              "",
30
41
}
43
}
31
42
44
32
43
type environConfig struct {
45
type environConfig struct {
33
@@ -89,6 +91,10 @@
34
89
	return c.attrs["use-default-secgroup"].(bool)
91
	return c.attrs["use-default-secgroup"].(bool)
35
90
}
92
}
36
91
93
37
94
func (c *environConfig) network() string {
38
95
	return c.attrs["network"].(string)
39
96
}
40
97
41
92
func (p environProvider) newConfig(cfg *config.Config) (*environConfig, error) {
98
func (p environProvider) newConfig(cfg *config.Config) (*environConfig, error) {
42
93
	valid, err := p.Validate(cfg, nil)
99
	valid, err := p.Validate(cfg, nil)
43
94
	if err != nil {
100
	if err != nil {
44
95
101
45
=== modified file 'provider/openstack/config_test.go'
46
--- provider/openstack/config_test.go	2013-12-23 00:46:18 +0000
47
+++ provider/openstack/config_test.go	2014-01-24 20:43:20 +0000
48
@@ -58,6 +58,7 @@
49
58
	toolsURL                string
58
	toolsURL                string
50
59
	useFloatingIP           bool
59
	useFloatingIP           bool
51
60
	useDefaultSecurityGroup bool
60
	useDefaultSecurityGroup bool
52
61
	network                 string
53
61
	username                string
62
	username                string
54
62
	password                string
63
	password                string
55
63
	tenantName              string
64
	tenantName              string
56
@@ -161,6 +162,7 @@
57
161
	}
162
	}
58
162
	c.Assert(ecfg.useFloatingIP(), gc.Equals, t.useFloatingIP)
163
	c.Assert(ecfg.useFloatingIP(), gc.Equals, t.useFloatingIP)
59
163
	c.Assert(ecfg.useDefaultSecurityGroup(), gc.Equals, t.useDefaultSecurityGroup)
164
	c.Assert(ecfg.useDefaultSecurityGroup(), gc.Equals, t.useDefaultSecurityGroup)
60
165
	c.Assert(ecfg.network(), gc.Equals, t.network)
61
164
	// Default should be true
166
	// Default should be true
62
165
	expectedHostnameVerification := true
167
	expectedHostnameVerification := true
63
166
	if t.sslHostnameSet {
168
	if t.sslHostnameSet {
64
@@ -430,6 +432,15 @@
65
430
		},
432
		},
66
431
		sslHostnameVerification: true,
433
		sslHostnameVerification: true,
67
432
		sslHostnameSet:          true,
434
		sslHostnameSet:          true,
68
435
	}, {
69
436
		summary: "default network",
70
437
		network: "",
71
438
	}, {
72
439
		summary: "network",
73
440
		config: attrs{
74
441
			"network": "a-network-label",
75
442
		},
76
443
		network: "a-network-label",
77
433
	},
444
	},
78
434
}
445
}
79
435
446
80
436
447
81
=== modified file 'provider/openstack/export_test.go'
82
--- provider/openstack/export_test.go	2013-12-10 04:25:06 +0000
83
+++ provider/openstack/export_test.go	2014-01-24 20:43:20 +0000
84
@@ -311,3 +311,8 @@
85
311
func GetNovaClient(e environs.Environ) *nova.Client {
311
func GetNovaClient(e environs.Environ) *nova.Client {
86
312
	return e.(*environ).nova()
312
	return e.(*environ).nova()
87
313
}
313
}
88
314
89
315
// ResolveNetwork exposes environ helper function resolveNetwork for testing
90
316
func ResolveNetwork(e environs.Environ, networkName string) (string, error) {
91
317
	return e.(*environ).resolveNetwork(networkName)
92
318
}
93
314
319
94
=== modified file 'provider/openstack/local_test.go'
95
--- provider/openstack/local_test.go	2013-12-20 02:38:56 +0000
96
+++ provider/openstack/local_test.go	2014-01-24 20:43:20 +0000
97
@@ -332,6 +332,48 @@
98
332
	c.Assert(hc.CpuPower, gc.IsNil)
332
	c.Assert(hc.CpuPower, gc.IsNil)
99
333
}
333
}
100
334
334
101
335
func (s *localServerSuite) TestStartInstanceNetwork(c *gc.C) {
102
336
	cfg, err := config.New(config.NoDefaults, s.TestConfig.Merge(coretesting.Attrs{
103
337
		// A label that corresponds to a nova test service network
104
338
		"network": "net",
105
339
	}))
106
340
	c.Assert(err, gc.IsNil)
107
341
	env, err := environs.New(cfg)
108
342
	c.Assert(err, gc.IsNil)
109
343
	inst, _ := testing.AssertStartInstance(c, env, "100")
110
344
	err = env.StopInstances([]instance.Instance{inst})
111
345
	c.Assert(err, gc.IsNil)
112
346
}
113
347
114
348
func (s *localServerSuite) TestStartInstanceNetworkUnknownLabel(c *gc.C) {
115
349
	cfg, err := config.New(config.NoDefaults, s.TestConfig.Merge(coretesting.Attrs{
116
350
		// A label that has no related network in the nova test service
117
351
		"network": "no-network-with-this-label",
118
352
	}))
119
353
	c.Assert(err, gc.IsNil)
120
354
	env, err := environs.New(cfg)
121
355
	c.Assert(err, gc.IsNil)
122
356
	inst, _, err := testing.StartInstance(env, "100")
123
357
	c.Check(inst, gc.IsNil)
124
358
	c.Assert(err, gc.ErrorMatches, "No networks exist with label .*")
125
359
}
126
360
127
361
func (s *localServerSuite) TestStartInstanceNetworkUnknownId(c *gc.C) {
128
362
	cfg, err := config.New(config.NoDefaults, s.TestConfig.Merge(coretesting.Attrs{
129
363
		// A valid UUID but no related network in the nova test service
130
364
		"network": "f81d4fae-7dec-11d0-a765-00a0c91e6bf6",
131
365
	}))
132
366
	c.Assert(err, gc.IsNil)
133
367
	env, err := environs.New(cfg)
134
368
	c.Assert(err, gc.IsNil)
135
369
	inst, _, err := testing.StartInstance(env, "100")
136
370
	c.Check(inst, gc.IsNil)
137
371
	c.Assert(err, gc.ErrorMatches, "cannot run instance: (\\n|.)*"+
138
372
		"caused by: "+
139
373
		"request \\(.*/servers\\) returned unexpected status: "+
140
374
		"404; error info: .*itemNotFound.*")
141
375
}
142
376
143
335
var instanceGathering = []struct {
377
var instanceGathering = []struct {
144
336
	ids []instance.Id
378
	ids []instance.Id
145
337
	err error
379
	err error
146
@@ -939,3 +981,31 @@
147
939
	c.Assert(err, gc.IsNil)
981
	c.Assert(err, gc.IsNil)
148
940
	c.Check(insts, gc.HasLen, 1)
982
	c.Check(insts, gc.HasLen, 1)
149
941
}
983
}
150
984
151
985
func (s *localServerSuite) TestResolveNetworkUUID(c *gc.C) {
152
986
	env := s.Prepare(c)
153
987
	var sampleUUID = "f81d4fae-7dec-11d0-a765-00a0c91e6bf6"
154
988
	networkId, err := openstack.ResolveNetwork(env, sampleUUID)
155
989
	c.Assert(err, gc.IsNil)
156
990
	c.Assert(networkId, gc.Equals, sampleUUID)
157
991
}
158
992
159
993
func (s *localServerSuite) TestResolveNetworkLabel(c *gc.C) {
160
994
	env := s.Prepare(c)
161
995
	// For now this test has to cheat and use knowledge of goose internals
162
996
	var networkLabel = "net"
163
997
	var expectNetworkId = "1"
164
998
	networkId, err := openstack.ResolveNetwork(env, networkLabel)
165
999
	c.Assert(err, gc.IsNil)
166
1000
	c.Assert(networkId, gc.Equals, expectNetworkId)
167
1001
}
168
1002
169
1003
func (s *localServerSuite) TestResolveNetworkNotPresent(c *gc.C) {
170
1004
	env := s.Prepare(c)
171
1005
	var notPresentNetwork = "no-network-with-this-label"
172
1006
	networkId, err := openstack.ResolveNetwork(env, notPresentNetwork)
173
1007
	c.Check(networkId, gc.Equals, "")
174
1008
	c.Assert(err, gc.ErrorMatches, `No networks exist with label "no-network-with-this-label"`)
175
1009
}
176
1010
177
1011
// TODO(gz): TestResolveNetworkMultipleMatching when can inject new networks
178
942
1012
179
=== modified file 'provider/openstack/provider.go'
180
--- provider/openstack/provider.go	2014-01-20 17:18:13 +0000
181
+++ provider/openstack/provider.go	2014-01-24 20:43:20 +0000
182
@@ -10,6 +10,7 @@
183
10
	"fmt"
10
	"fmt"
184
11
	"io/ioutil"
11
	"io/ioutil"
185
12
	"net/http"
12
	"net/http"
186
13
	"regexp"
187
13
	"strings"
14
	"strings"
188
14
	"sync"
15
	"sync"
189
15
	"time"
16
	"time"
190
@@ -75,6 +76,10 @@
191
75
    # Openstack security group assigned.
76
    # Openstack security group assigned.
192
76
    # use-default-secgroup: false
77
    # use-default-secgroup: false
193
77
78
194
79
    # network specifies the network label or uuid to bring machines up on, in
195
80
    # the case where multiple networks exist. It may be omitted otherwise.
196
81
    # network: <your network label or uuid>
197
82
198
78
    # tools-metadata-url specifies the location of the Juju tools and metadata. It defaults to the
83
    # tools-metadata-url specifies the location of the Juju tools and metadata. It defaults to the
199
79
    # global public tools metadata location https://streams.canonical.com/tools.
84
    # global public tools metadata location https://streams.canonical.com/tools.
200
80
    # tools-metadata-url:  https://you-tools-metadata-url
85
    # tools-metadata-url:  https://you-tools-metadata-url
201
@@ -631,6 +636,37 @@
202
631
	return e.toolsSources, nil
636
	return e.toolsSources, nil
203
632
}
637
}
204
633
638
205
639
// TODO(gz): Move this somewhere more reusable
206
640
const uuidPattern = "^([a-fA-F0-9]{8})-([a-fA-f0-9]{4})-([1-5][a-fA-f0-9]{3})-([a-fA-f0-9]{4})-([a-fA-f0-9]{12})$"
207
641
208
642
var uuidRegexp = regexp.MustCompile(uuidPattern)
209
643
210
644
// resolveNetwork takes either a network id or label and returns a network id
211
645
func (e *environ) resolveNetwork(networkName string) (string, error) {
212
646
	if uuidRegexp.MatchString(networkName) {
213
647
		// Network id supplied, assume valid as boot will fail if not
214
648
		return networkName, nil
215
649
	}
216
650
	// Network label supplied, resolve to a network id
217
651
	networks, err := e.nova().ListNetworks()
218
652
	if err != nil {
219
653
		return "", err
220
654
	}
221
655
	var networkIds = []string{}
222
656
	for _, network := range networks {
223
657
		if network.Label == networkName {
224
658
			networkIds = append(networkIds, network.Id)
225
659
		}
226
660
	}
227
661
	switch len(networkIds) {
228
662
	case 1:
229
663
		return networkIds[0], nil
230
664
	case 0:
231
665
		return "", fmt.Errorf("No networks exist with label %q", networkName)
232
666
	}
233
667
	return "", fmt.Errorf("Multiple networks with label %q: %v", networkName, networkIds)
234
668
}
235
669
236
634
// allocatePublicIP tries to find an available floating IP address, or
670
// allocatePublicIP tries to find an available floating IP address, or
237
635
// allocates a new one, returning it, or an error
671
// allocates a new one, returning it, or an error
238
636
func (e *environ) allocatePublicIP() (*nova.FloatingIP, error) {
672
func (e *environ) allocatePublicIP() (*nova.FloatingIP, error) {
239
@@ -711,6 +747,16 @@
240
711
		return nil, nil, fmt.Errorf("cannot make user data: %v", err)
747
		return nil, nil, fmt.Errorf("cannot make user data: %v", err)
241
712
	}
748
	}
242
713
	logger.Debugf("openstack user data; %d bytes", len(userData))
749
	logger.Debugf("openstack user data; %d bytes", len(userData))
243
750
	var networks = []nova.ServerNetworks{}
244
751
	usingNetwork := e.ecfg().network()
245
752
	if usingNetwork != "" {
246
753
		networkId, err := e.resolveNetwork(usingNetwork)
247
754
		if err != nil {
248
755
			return nil, nil, err
249
756
		}
250
757
		logger.Debugf("using network id %q", networkId)
251
758
		networks = append(networks, nova.ServerNetworks{NetworkId: networkId})
252
759
	}
253
714
	withPublicIP := e.ecfg().useFloatingIP()
760
	withPublicIP := e.ecfg().useFloatingIP()
254
715
	var publicIP *nova.FloatingIP
761
	var publicIP *nova.FloatingIP
255
716
	if withPublicIP {
762
	if withPublicIP {
256
@@ -730,16 +776,17 @@
257
730
	for i, g := range groups {
776
	for i, g := range groups {
258
731
		groupNames[i] = nova.SecurityGroupName{g.Name}
777
		groupNames[i] = nova.SecurityGroupName{g.Name}
259
732
	}
778
	}
261
733
779
	var opts = nova.RunServerOpts{
262
780
		Name:               e.machineFullName(machineConfig.MachineId),
263
781
		FlavorId:           spec.InstanceType.Id,
264
782
		ImageId:            spec.Image.Id,
265
783
		UserData:           userData,
266
784
		SecurityGroupNames: groupNames,
267
785
		Networks:           networks,
268
786
	}
269
734
	var server *nova.Entity
787
	var server *nova.Entity
270
735
	for a := shortAttempt.Start(); a.Next(); {
788
	for a := shortAttempt.Start(); a.Next(); {
278
736
		server, err = e.nova().RunServer(nova.RunServerOpts{
789
		server, err = e.nova().RunServer(opts)
272
737
			Name:               e.machineFullName(machineConfig.MachineId),
273
738
			FlavorId:           spec.InstanceType.Id,
274
739
			ImageId:            spec.Image.Id,
275
740
			UserData:           userData,
276
741
			SecurityGroupNames: groupNames,
277
742
		})
279
743
		if err == nil || !gooseerrors.IsNotFound(err) {
790
		if err == nil || !gooseerrors.IsNotFound(err) {
280
744
			break
791
			break
281
745
		}
792
		}
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-01-24	Pending
Review via email: mp+203114@code.launchpad.net