Merge pull request #1058 from ish-hcc/fix_azure_and_ibm

[+Price] Show PricingPolicyInfo attributes as NA
cloud-barista · Feb 8, 2024 · 0341e9b · 0341e9b
2 parents c1b5c5a + 1f17841
commit 0341e9b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/cloud-control-manager/cloud-driver/drivers/azure/resources/PriceInfoHandler.go b/cloud-control-manager/cloud-driver/drivers/azure/resources/PriceInfoHandler.go
@@ -296,13 +296,17 @@ func (priceInfoHandler *AzurePriceInfoHandler) GetPriceInfo(productFamily string
 
 		for _, item := range value {
 			pricingPolicy := irs.PricingPolicies{
-				PricingId:         item.SkuID,
-				PricingPolicy:     item.Type,
-				Unit:              item.UnitOfMeasure,
-				Currency:          item.CurrencyCode,
-				Price:             strconv.FormatFloat(item.RetailPrice, 'f', -1, 64),
-				Description:       "NA",
-				PricingPolicyInfo: nil,
+				PricingId:     item.SkuID,
+				PricingPolicy: item.Type,
+				Unit:          item.UnitOfMeasure,
+				Currency:      item.CurrencyCode,
+				Price:         strconv.FormatFloat(item.RetailPrice, 'f', -1, 64),
+				Description:   "NA",
+				PricingPolicyInfo: &irs.PricingPolicyInfo{
+					LeaseContractLength: "NA",
+					OfferingClass:       "NA",
+					PurchaseOption:      "NA",
+				},
 			}
 
 			picked := true

diff --git a/cloud-control-manager/cloud-driver/drivers/ibmcloud-vpc/resources/PriceInfoHandler.go b/cloud-control-manager/cloud-driver/drivers/ibmcloud-vpc/resources/PriceInfoHandler.go
@@ -587,13 +587,17 @@ func (priceInfoHandler *IbmPriceInfoHandler) GetPriceInfo(productFamily string,
 
 					for _, price := range amount.Prices {
 						pricingPolicy := irs.PricingPolicies{
-							PricingId:         metric.MetricID,
-							PricingPolicy:     "quantity_tier=" + strconv.Itoa(price.QuantityTier),
-							Unit:              metric.ChargeUnit,
-							Currency:          currency,
-							Price:             strconv.FormatFloat(price.Price, 'f', -1, 64),
-							Description:       metric.ChargeUnitDisplayName,
-							PricingPolicyInfo: nil,
+							PricingId:     metric.MetricID,
+							PricingPolicy: "quantity_tier=" + strconv.Itoa(price.QuantityTier),
+							Unit:          metric.ChargeUnit,
+							Currency:      currency,
+							Price:         strconv.FormatFloat(price.Price, 'f', -1, 64),
+							Description:   metric.ChargeUnitDisplayName,
+							PricingPolicyInfo: &irs.PricingPolicyInfo{
+								LeaseContractLength: "NA",
+								OfferingClass:       "NA",
+								PurchaseOption:      "NA",
+							},
 						}
 
 						picked := true