Merge pull request #299 from cloudfoundry/get-null-locationGroupId

Retrieve standard prices from a package.

src/bosh-softlayer-cpi/softlayer/client/client.go

@@ -779,9 +779,12 @@ func (c *ClientManager) UpgradeInstance(id int, cpu int, memory int, network int
 		return 0, bosherr.Errorf("No package found for type: %s", packageType)
 	}
 	packageID := *productPackages[0].Id
+	filters := filter.Path("items.prices.locationGroupId").IsNull().Build()
+
 	packageItems, err := c.PackageService.
 		Id(packageID).
 		Mask("keyName, description, capacity, prices[id, locationGroupId, categories[categoryCode]]").
+		Filter(filters).
 		GetItems()
 	if err != nil {
 		return 0, err
@@ -1621,7 +1624,7 @@ func (c *ClientManager) AttachSecondDiskToInstance(id int, diskSize int) error {
 	var err error
 	until := time.Now().Add(time.Duration(1) * time.Hour)
 	if err = c.WaitInstanceHasNoneActiveTransaction(*sl.Int(id), until); err != nil {
-		return bosherr.WrapError(err, "Waiting until instance has none active transaction before os_reload")
+		return bosherr.WrapError(err, "Waiting until instance has none active transaction before attach ephemeral disk")
 	}
 
 	orderId, err := c.UpgradeInstance(id, 0, 0, 0, false, false, diskSize)
@@ -1646,7 +1649,7 @@ func (c *ClientManager) UpgradeInstanceConfig(id int, cpu int, memory int, netwo
 	var err error
 	until := time.Now().Add(time.Duration(1) * time.Hour)
 	if err = c.WaitInstanceHasNoneActiveTransaction(*sl.Int(id), until); err != nil {
-		return bosherr.WrapError(err, "Waiting until instance has none active transaction before os_reload")
+		return bosherr.WrapError(err, "Waiting until instance has none active transaction before upgrade instance")
 	}
 
 	orderId, err := c.UpgradeInstance(id, cpu, memory, network, privateCPU, dedicatedHost, 0)

src/bosh-softlayer-cpi/softlayer/client/instance_handler_test.go

@@ -2275,7 +2275,7 @@ var _ = Describe("InstanceHandler", func() {
 
 			err := cli.AttachSecondDiskToInstance(vgID, 300)
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("Waiting until instance has none active transaction before os_reload"))
+			Expect(err.Error()).To(ContainSubstring("Waiting until instance has none active transaction before attach ephemeral disk"))
 		})
 
 		It("Return error when call UpgradeInstance return an error", func() {
@@ -2482,7 +2482,7 @@ var _ = Describe("InstanceHandler", func() {
 
 			err := cli.UpgradeInstanceConfig(vgID, 2, 0, 0, false, false)
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("Waiting until instance has none active transaction before os_reload"))
+			Expect(err.Error()).To(ContainSubstring("Waiting until instance has none active transaction before upgrade instance"))
 		})
 
 		It("Return error when call UpgradeInstance return error", func() {