← 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/gomaasapi/testservice_subnets.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/gomaasapi/testservice_subnets.go
250
250
        copy(ipAddresses, subnet.InUseIPAddresses)
251
251
        appendRangesToIPList(subnet, &ipAddresses)
252
252
        sort.Sort(addressList(ipAddresses))
 
253
        if len(ipAddresses) == 0 {
 
254
                ar := ranges.ar
 
255
                if ar == nil {
 
256
                        ar = []AddressRange{}
 
257
                }
 
258
                return ar
 
259
        }
 
260
 
253
261
        startIP = ipAddresses[0]
254
262
        lastIP := ipAddresses[0]
255
 
 
256
 
        if len(ipAddresses) == 0 {
257
 
                return ranges.ar
258
 
        }
259
 
 
260
263
        for _, thisIP = range ipAddresses {
261
264
                var purposeMissmatch bool
262
265
                for i, p := range thisIP.Purpose {