Merge pull request #305 from markdryan/master

Remove github.com/docker/distribution/uuid dependency

Author: Samuel Ortiz

.travis.yml

@@ -60,7 +60,7 @@ script:
    - go list ./... | grep -v github.com/01org/ciao/vendor | xargs go list -f '{{.Dir}}' | xargs gofmt -s -l | wc -l | xargs -I % bash -c "test % -eq 0"
    - sudo mkdir -p /var/lib/ciao/instances
    - sudo chmod 0777 /var/lib/ciao/instances
-   - test-cases -text -coverprofile /tmp/cover.out -short github.com/01org/ciao/ciao-launcher github.com/01org/ciao/ciao-scheduler github.com/01org/ciao/ciao-controller/... github.com/01org/ciao/payloads github.com/01org/ciao/configuration github.com/01org/ciao/testutil
+   - test-cases -text -coverprofile /tmp/cover.out -short github.com/01org/ciao/ciao-launcher github.com/01org/ciao/ciao-scheduler github.com/01org/ciao/ciao-controller/... github.com/01org/ciao/payloads github.com/01org/ciao/configuration github.com/01org/ciao/testutil github.com/01org/ciao/ssntp/uuid
    - export GOROOT=`go env GOROOT` && sudo -E PATH=$PATH:$GOROOT/bin $GOPATH/bin/test-cases -text -coverprofile /tmp/cover.out -append-profile github.com/01org/ciao/ssntp
    - export GOROOT=`go env GOROOT` && export SNNET_ENV=198.51.100.0/24 && sudo -E PATH=$PATH:$GOROOT/bin $GOPATH/bin/test-cases -text -short -tags travis -coverprofile /tmp/cover.out -append-profile github.com/01org/ciao/networking/libsnnet
 

ciao-controller/controller_test.go

@@ -28,8 +28,8 @@ import (
 	"github.com/01org/ciao/ciao-controller/types"
 	"github.com/01org/ciao/payloads"
 	"github.com/01org/ciao/ssntp"
+	"github.com/01org/ciao/ssntp/uuid"
 	"github.com/01org/ciao/testutil"
-	"github.com/docker/distribution/uuid"
 )
 
 func addTestTenant() (tenant *types.Tenant, err error) {

ciao-controller/instance.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/01org/ciao/ciao-controller/types"
 	"github.com/01org/ciao/payloads"
-	"github.com/docker/distribution/uuid"
+	"github.com/01org/ciao/ssntp/uuid"
 	"github.com/golang/glog"
 	"gopkg.in/yaml.v2"
 )

ciao-controller/internal/datastore/datastore_test.go

@@ -29,7 +29,7 @@ import (
 
 	"github.com/01org/ciao/ciao-controller/types"
 	"github.com/01org/ciao/payloads"
-	"github.com/docker/distribution/uuid"
+	"github.com/01org/ciao/ssntp/uuid"
 )
 
 func newTenantHardwareAddr(ip net.IP) (hw net.HardwareAddr) {

ciao-scheduler/scheduler_ssntp_test.go

@@ -25,8 +25,8 @@ import (
 
 	"github.com/01org/ciao/payloads"
 	"github.com/01org/ciao/ssntp"
+	"github.com/01org/ciao/ssntp/uuid"
 	"github.com/01org/ciao/testutil"
-	"github.com/docker/distribution/uuid"
 )
 
 /****************************************************************************/

ciao-vendor/packages.json

@@ -14,11 +14,6 @@
 		"version": "fbb7337",
 		"license": "Apache v2.0"
 	},
-	"github.com/docker/distribution": {
-		"url": "https://github.com/docker/distribution.git",
-		"version": "v2.4.0",
-		"license": "Apache v2.0"
-	},
 	"github.com/docker/docker": {
 		"url": "https://github.com/docker/docker.git",
 		"version": "v1.10.3",

networking/libsnnet/docker_plugin.go

@@ -28,7 +28,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/docker/distribution/uuid"
+	"github.com/01org/ciao/ssntp/uuid"
 	"github.com/docker/libnetwork/drivers/remote/api"
 	ipamapi "github.com/docker/libnetwork/ipams/remote/api"
 	"github.com/golang/glog"

networking/libsnnet/tests/docker/plugin/plugin.go

@@ -29,8 +29,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/01org/ciao/ssntp/uuid"
 	"github.com/boltdb/bolt"
-	"github.com/docker/distribution/uuid"
 	"github.com/docker/libnetwork/drivers/remote/api"
 	ipamapi "github.com/docker/libnetwork/ipams/remote/api"
 	"github.com/golang/glog"

payloads/assignpublicIP_test.go

@@ -20,8 +20,8 @@ import (
 	"testing"
 
 	. "github.com/01org/ciao/payloads"
+	"github.com/01org/ciao/ssntp/uuid"
 	"github.com/01org/ciao/testutil"
-	"github.com/docker/distribution/uuid"
 	"gopkg.in/yaml.v2"
 )
 

ssntp/client.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/01org/ciao/payloads"
-	"github.com/docker/distribution/uuid"
+	"github.com/01org/ciao/ssntp/uuid"
 	"gopkg.in/yaml.v2"
 )
 

ssntp/frame.go

@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/01org/ciao/payloads"
-	"github.com/docker/distribution/uuid"
+	"github.com/01org/ciao/ssntp/uuid"
 )
 
 // TraceConfig is the SSNTP tracing configuration to be used

ssntp/server.go

@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/01org/ciao/configuration"
-	"github.com/docker/distribution/uuid"
+	"github.com/01org/ciao/ssntp/uuid"
 )
 
 // ServerNotifier is the SSNTP server notification interface.

ssntp/session.go

@@ -21,7 +21,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/docker/distribution/uuid"
+	"github.com/01org/ciao/ssntp/uuid"
 )
 
 func setReadTimeout(conn net.Conn) {

ssntp/ssntp.go

@@ -31,7 +31,7 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/docker/distribution/uuid"
+	"github.com/01org/ciao/ssntp/uuid"
 	"github.com/golang/glog"
 )
 

ssntp/uuid/uuid.go

@@ -0,0 +1,137 @@
+//
+// Copyright (c) 2016 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Package uuid can be used to generate 128 bit UUIDs compatible with
+// rfc4122.  Currently, only version 4 UUIDs, UUIDs generated from random
+// data, can be created.  The package includes functions for generating
+// UUIDs and for converting them to and from strings.
+package uuid
+
+import (
+	"crypto/rand"
+	"encoding/binary"
+	"errors"
+	"fmt"
+	"io"
+	"strconv"
+	"strings"
+)
+
+// UUID represents a single 128 bit UUID as an array of 16 bytes.
+type UUID [16]byte
+
+var (
+	// ErrUUIDInvalid indicates that a UIID is invalid.  Currently,
+	// returned by uuid.Parse if the string passed to this function
+	// does not contain a valid UUID.
+	ErrUUIDInvalid = errors.New("invalid uuid")
+)
+
+func encode4bytes(n uint64, b []byte) {
+	binary.BigEndian.PutUint32(b, uint32(n))
+}
+
+func encode2bytes(n uint64, b []byte) {
+	binary.BigEndian.PutUint16(b, uint16(n))
+}
+
+func encode1byte(n uint64, b []byte) {
+	b[0] = uint8(n)
+}
+
+func encode6bytes(n uint64, b []byte) {
+	d := make([]byte, 8)
+	binary.BigEndian.PutUint64(d, n)
+	copy(b, d[2:])
+}
+
+func stringToBE(s string, b []byte, f func(uint64, []byte)) error {
+	num, err := strconv.ParseUint(s, 16, len(s)*4)
+	if err != nil {
+		return ErrUUIDInvalid
+	}
+	f(num, b)
+	return nil
+}
+
+// Parse returns the binary encoding of the UUID passed in the s parameter.
+// The error ErrUUIDInvalid will be returned if s does not represent a valid
+// UUID.
+func Parse(s string) (UUID, error) {
+	var uuid UUID
+	var segmentSizes = [...]int{8, 4, 4, 4, 12}
+
+	segments := strings.Split(s, "-")
+	if len(segments) != len(segmentSizes) {
+		return uuid, ErrUUIDInvalid
+	}
+
+	for i, l := range segmentSizes {
+		if len(segments[i]) != l {
+			return uuid, ErrUUIDInvalid
+		}
+	}
+
+	if err := stringToBE(segments[0], uuid[:4], encode4bytes); err != nil {
+		return uuid, err
+	}
+	if err := stringToBE(segments[1], uuid[4:6], encode2bytes); err != nil {
+		return uuid, err
+	}
+	if err := stringToBE(segments[2], uuid[6:8], encode2bytes); err != nil {
+		return uuid, err
+	}
+	if err := stringToBE(segments[3][:2], uuid[8:9], encode1byte); err != nil {
+		return uuid, err
+	}
+	if err := stringToBE(segments[3][2:], uuid[9:10], encode1byte); err != nil {
+		return uuid, err
+	}
+	if err := stringToBE(segments[4], uuid[10:], encode6bytes); err != nil {
+		return uuid, err
+	}
+
+	return uuid, nil
+}
+
+// Generate generates a new v4 UUID, i.e., a random UUID.
+func Generate() UUID {
+	var u UUID
+
+	_, err := io.ReadFull(rand.Reader, u[:])
+	if err != nil {
+		panic(fmt.Errorf("Unable to read random data : %v", err))
+	}
+
+	u[6] = (u[6] & 0x0f) | 0x40
+	u[8] = (u[8] & 0x3f) | 0x80
+
+	return u
+}
+
+func (u UUID) String() string {
+	timeLow := binary.BigEndian.Uint32(u[:4])
+	timeMid := binary.BigEndian.Uint16(u[4:6])
+	timeHi := binary.BigEndian.Uint16(u[6:8])
+	clkSeqHi := u[8]
+	clkSeqLow := u[9]
+	buf := make([]byte, 8)
+	copy(buf[2:], u[10:])
+	node := uint64(binary.BigEndian.Uint64(buf))
+
+	return fmt.Sprintf("%08x-%04x-%04x-%02x%02x-%012x",
+		timeLow, timeMid, timeHi, clkSeqHi, clkSeqLow, node)
+}

ssntp/uuid/uuid_test.go

@@ -0,0 +1,95 @@
+//
+// Copyright (c) 2016 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package uuid
+
+import "testing"
+
+// Test UUID parsing and string conversation.
+//
+// This test simply converts a set of strings to UUIDs and back again.
+//
+// The original strings and the strings generated from the UUIDs match.
+func TestUUID(t *testing.T) {
+	testUUIDs := []string{
+		"f81d4fae-7dec-11d0-a765-00a0c91e6bf6",
+		"30dedd5c-48d9-45d3-8b44-f973e4f35e48",
+		"69e84267-ed01-4738-b15f-b47de06b62e7",
+		"e35ed972-c46c-4aad-a1e7-ef103ae079a2",
+		"eba04826-62a5-48bd-876f-9119667b1487",
+		"ca957444-fa46-11e5-94f9-38607786d9ec",
+		"ab68111c-03a6-11e6-87de-001320fb6e31",
+	}
+
+	for _, s := range testUUIDs {
+		uuid, err := Parse(s)
+		if err != nil {
+			t.Fatalf("Unable to parse %s: %s", s, err)
+		}
+		s2 := uuid.String()
+		if s != s2 {
+			t.Fatalf("%s and %s do not match", s, s2)
+		}
+	}
+}
+
+// Test UUID generation.
+//
+// This test generates 100 new UUIDs and then verifies that those UUIDs
+// can be parsed.
+//
+// The UUIDs are generated correctly, their version number is correct,
+// and they can be parsed.
+func TestGenUUID(t *testing.T) {
+	for i := 0; i < 100; i++ {
+		u := Generate()
+		s := u.String()
+		if s[14] != '4' {
+			t.Fatalf("Invalid UUID.  Version number is incorrect")
+		}
+		u2, err := Parse(s)
+		if err != nil {
+			t.Fatalf("Failed to parse UUID %s : %s", s, err)
+		}
+		if u != u2 {
+			t.Fatalf("Generated and Parsed UUIDs are not equal")
+		}
+	}
+}
+
+// Test uuid.Parse on invalid input.
+//
+// This test attempts to parse a set of invalid UUIDs.
+//
+// uuid.Parse should return an error for each invalid UUID.
+func TestBadUUID(t *testing.T) {
+	badTestUUIDs := []string{
+		"",
+		"48d9-45d3-8b44-f973e4f35e48",
+		"69e8426--ed01-4738-b15f-b47de06b62e7",
+		"e35ed972-46c-4aad-a1e7-ef103ae079a2",
+		"sba04826-62a5-48bd-876f-9119667b1487",
+		"ca957444fa4611e594f938607786d9ec0000",
+		"ab68111c-03a6-11e6-87de-001320fb6e31a",
+	}
+
+	for _, s := range badTestUUIDs {
+		_, err := Parse(s)
+		if err == nil {
+			t.Fatalf("uuid.Parse should fail to parse %s", s)
+		}
+	}
+}

testutil/client_server_test.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/01org/ciao/payloads"
 	"github.com/01org/ciao/ssntp"
+	"github.com/01org/ciao/ssntp/uuid"
 	. "github.com/01org/ciao/testutil"
-	"github.com/docker/distribution/uuid"
 )
 
 var server SsntpTestServer