Merge pull request #38 from joyent/36-add-hardware-cli

Add CLI for hardware vendors and products

builds.go

@@ -121,7 +121,6 @@ func (b *Builds) GetByName(name string) (build Build) {
 		panic(res)
 	}
 	return
-
 }
 
 func (b *Builds) Create(name, description string, admins []map[string]string) (build Build) {

builds_integration_test.go

@@ -5,12 +5,15 @@ import (
 )
 
 func TestBuildAPIintegration(t *testing.T) {
+	defer errorHandler()
+
 	setupAPIClient()
 	r := setupRecorder("fixtures/conch-v3/builds")
 	defer r() // Make sure recorder is stopped once done with it
 
 	var build Build
 	t.Run("create a build", func(t *testing.T) {
+		defer errorHandler()
 		fake := newTestBuild()
 		build = API.Builds().Create(
 			fake.Name,
@@ -20,10 +23,12 @@ func TestBuildAPIintegration(t *testing.T) {
 	})
 
 	t.Run("get all builds", func(t *testing.T) {
+		defer errorHandler()
 		_ = API.Builds().GetAll()
 	})
 
 	t.Run("get a specific build", func(t *testing.T) {
+		defer errorHandler()
 		_ = API.Builds().Get(build.ID)
 	})
 }

devices.go

@@ -174,14 +174,17 @@ type DeviceReport map[string]interface{}
 
 type DeviceLocation struct {
 	Datacenter            Datacenter `json:"datacenter"`
-	Room                  Room       `json:"datacenter_room"`
-	Rack                  Rack       `json:"rack"`
-	RackUnitStart         int        `json:"rack_unit_start" faker:"rack_unit_start"`
+	AZ                    string     `json:"az"`
+	RoomName              string     `json:"datacenter_room"`
+	Rack                  Rack
+	RackName              string `json:"rack"`
+	RackUnitStart         int    `json:"rack_unit_start" faker:"rack_unit_start"`
 	TargetHardwareProduct struct {
 		ID     uuid.UUID `json:"id" faker"uuid"`
 		Name   string    `json:"name"`
 		Alias  string    `json:"alias"`
 		Vendor string    `json:"hardware_vendor_id"`
+		SKU    string    `json:"sku,omitempty"`
 	} `json:"target_hardware_product"`
 }
 
@@ -217,7 +220,7 @@ func (ds *Devices) DeleteLocation(id string) {
 	uri := fmt.Sprintf("/device/%s/location", url.PathEscape(id))
 
 	res := ds.Do(ds.Sling().New().Delete(uri))
-	if res.StatusCode() != 204 {
+	if res.IsError() {
 		panic(res)
 	}
 }
@@ -294,7 +297,9 @@ type deviceCore struct {
 	Validated         time.Time `json:"validated,omitempty" faker:"-"`
 	Phase             string    `json:"phase"`
 
-	BuildID uuid.UUID `json:"build_id" faker:"-"`
+	BuildID   uuid.UUID `json:"build_id" faker:"-"`
+	BuildName string    `json:"build_name"`
+	SKU       string    `json:"sku"`
 }
 
 type Disk struct {
@@ -352,6 +357,9 @@ func (d DetailedDevice) String() string {
 	}
 
 	var rackRole RackRole
+	if (d.Location.Rack == Rack{}) {
+		d.Location.Rack = API.Racks().GetByName(d.Location.RackName)
+	}
 	if (d.Location.Rack.RoleID != uuid.UUID{}) {
 		rackRole = API.RackRoles().Get(d.Location.Rack.RoleID)
 	}

devices_integration_test.go

@@ -15,7 +15,6 @@ func TestDeviceAPIIntegration(t *testing.T) {
 	defer r() // Make sure recorder is stopped once done with it
 
 	f := newFixture()
-	f.setupBuild()
 	f.setupRackLayout()
 	defer f.reset()