Merge pull request #925 from SoftLayer/issues924

Added support for nvme dual raid ordering.

Author: cloud-iaas-fabric-automation cloud-iaas-fabric-automation

plugin/i18n/v2Resources/active.en-US.json

@@ -3944,6 +3944,9 @@
   "Item {{.Item}} does not exist for package {{.Package}}": {
     "other": "Item {{.Item}} does not exist for package {{.Package}}"
   },
+  "Item {{.Item}} does not exist for package {{.Package}} with category {{.Category}}": {
+    "other": "Item {{.Item}} does not exist for package {{.Package}} with category {{.Category}}"
+  },
   "Item: {{.itemID}} was cancelled.": {
     "other": "Item: {{.itemID}} was cancelled."
   },

plugin/managers/order.go

@@ -332,7 +332,8 @@ func (i orderManager) GetPriceIdList(packageKeyname string, itemKeynames []strin
 		return nil, err
 	}
 	var prices []int
-	categoryDict := map[string]int{"gpu0": -1, "pcie_slot0": -1}
+	// start at -1 so we can increment before we use it. 0 is a valid value here
+	categoryDict := map[string]int{"gpu0": -1, "pcie_slot0": -1, "disk_controller": -1}
 
 	for _, itemKeyname := range itemKeynames {
 		var newItems []datatypes.Product_Item
@@ -355,10 +356,10 @@ func (i orderManager) GetPriceIdList(packageKeyname string, itemKeynames []strin
 			itemCategory = *matchingItem.ItemCategory.CategoryCode
 		}
 
+		// Normal items
 		if _, ok := categoryDict[itemCategory]; !ok {
 			for _, p := range matchingItem.Prices {
-				if ((p.LocationGroupId != nil && *p.LocationGroupId == 0) ||
-					p.LocationGroupId == nil) && p.Id != nil {
+				if isDefaultPrice(p) {
 
 					capacityMin := -1
 					capacityMax := -1
@@ -386,19 +387,23 @@ func (i orderManager) GetPriceIdList(packageKeyname string, itemKeynames []strin
 					}
 				}
 			}
+		// Items in categoryDict need special handling if there are more than 1
 		} else {
-			var PriceIdList []int
+
 			categoryDict[itemCategory] += 1
-			categoryCode := itemCategory[:len(itemCategory)-1] + strconv.Itoa(categoryDict[itemCategory])
+			categoryCode := getSpecialCategory(categoryDict[itemCategory], itemCategory)
 			for _, p := range matchingItem.Prices {
-				if p.LocationGroupId != nil && *p.LocationGroupId == 0 &&
-					len(p.Categories) > 0 && p.Categories[0].CategoryCode != nil &&
+				if isDefaultPrice(p) && len(p.Categories) > 0 && p.Categories[0].CategoryCode != nil &&
 					*p.Categories[0].CategoryCode == categoryCode {
-
-					PriceIdList = append(PriceIdList, *p.Id)
+					priceId = *p.Id
 				}
 			}
-			priceId = PriceIdList[0]
+			if priceId == 0 {
+				subs := map[string]interface{}{"Item": itemKeyname, "Package": packageKeyname, "Category": categoryCode}
+				return nil, errors.New(
+					T("Item {{.Item}} does not exist for package {{.Package}} with category {{.Category}}", subs))
+			}
+
 		}
 		prices = append(prices, priceId)
 	}
@@ -491,3 +496,28 @@ func (i orderManager) GetAllCancelation(mask string) ([]datatypes.Billing_Item_C
 func (i orderManager) DeleteQuote(quoteId int) (datatypes.Billing_Order_Quote, error) {
 	return i.BillingOrderQuoteService.Id(quoteId).DeleteQuote()
 }
+
+func getSpecialCategory(index int, base string) string {
+	// Special case because its disk_controller and disk_controller1
+	// unlike gpu0/pci0 -> gpu1/pci1
+	if base == "disk_controller" {
+		if index == 0 {
+			return base
+		} else {
+			return fmt.Sprintf("%s1", base)
+		}
+	}
+	categoryCode := base[:len(base)-1] + strconv.Itoa(index)
+	return categoryCode
+}
+
+func isDefaultPrice(price datatypes.Product_Item_Price) bool {
+	if price.LocationGroupId != nil && *price.LocationGroupId > 0 {
+		return false
+	} else {
+		if price.Id != nil  {
+			return true
+		}
+	}
+	return false
+}

plugin/managers/order_test.go

@@ -222,8 +222,7 @@ var _ = Describe("Order", func() {
 	})
 	Describe("GetPriceIdList", func() {
 		Items := []string{
-			"PRIVATE_NETWORK_VLAN",
-			"DOMAIN_INFO_1_YEAR",
+			"PRIVATE_NETWORK_VLAN", "DOMAIN_INFO_1_YEAR",
 		}
 		BeforeEach(func() {
 			fakeSLSession = testhelpers.NewFakeSoftlayerSession(nil)
@@ -250,5 +249,36 @@ var _ = Describe("Order", func() {
 				Expect(err).To(HaveOccurred())
 			})
 		})
+		Context("NVMe Selection", func() {
+			BeforeEach(func() {
+				handler := testhelpers.GetSessionHandler(fakeSLSession)
+				handler.SetFileNames([]string{"getItems-3137"})
+			})
+			It("Select NVMe Prices", func() {
+				Items := []string{
+					"DISK_CONTROLLER_RAID", "DISK_CONTROLLER_RAID_1_MIRRORED_NMVE_M_2",
+				}
+				prices, err := OrderManager.GetPriceIdList("Test", Items, 0)
+				Expect(err).ToNot(HaveOccurred())
+				Expect(len(prices)).To(Equal(2))
+				Expect(prices[0]).To(Equal(22484))  // DISK_CONTROLLER_RAID
+				Expect(prices[1]).To(Equal(306531)) // DISK_CONTROLLER_RAID_1_MIRRORED_NMVE_M_2
+			})
+			It("Select nonraid Prices", func() {
+				Items := []string{"DISK_CONTROLLER_NONRAID"}
+				prices, err := OrderManager.GetPriceIdList("Test", Items, 0)
+				Expect(err).ToNot(HaveOccurred())
+				Expect(len(prices)).To(Equal(1))
+				Expect(prices[0]).To(Equal(876))  // DISK_CONTROLLER_NONRAID
+			})
+			It("Select NVMe Prices Failure", func() {
+				Items := []string{
+					"DISK_CONTROLLER_RAID_1_MIRRORED_NMVE_M_2", "DISK_CONTROLLER_RAID",
+				}
+				_, err := OrderManager.GetPriceIdList("Test", Items, 0)
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("Item DISK_CONTROLLER_RAID does not exist for package Test with category disk_controller1"))
+			})
+		})
 	})
 })