Sync to Dublin SDC
Issue-ID: SDC-2205
Change-Id: I903f8c5124bef4a2b9ba868af20329e4752382c6
Signed-off-by: Brian Freeman <bf1936@att.com>
diff --git a/robot/assets/templates/asdc/entitlement_pool.template b/robot/assets/templates/asdc/entitlement_pool.template
index bcb04d2..b7e6825 100644
--- a/robot/assets/templates/asdc/entitlement_pool.template
+++ b/robot/assets/templates/asdc/entitlement_pool.template
@@ -1,26 +1,13 @@
{
- "name": "${entitlement_pool_name}",
- "description": "vendor entitlement pool",
- "thresholdValue": "99",
- "thresholdUnits": "Absolute",
- "entitlementMetric": {
- "choice": "CPU",
- "other": ""
- },
- "increments": "robot",
- "aggregationFunction": {
- "choice": "Peak",
- "other": ""
- },
- "operationalScope": {
- "choices": [
- "Availability_Zone"
- ],
- "other": ""
- },
- "time": {
- "choice": "Hour",
- "other": ""
- },
- "manufacturerReferenceNumber": "robot12345"
-}
\ No newline at end of file
+ "name": "${entitlement_pool_name}",
+ "description": "vendor entitlement pool",
+ "thresholdValue": "100",
+ "thresholdUnits": "Percentage",
+ "time": {
+ "choice": "",
+ "other": ""
+ },
+ "startDate": "${license_start_date}",
+ "expiryDate": "${license_end_date}",
+ "manufacturerReferenceNumber": "111111"
+}
diff --git a/robot/assets/templates/asdc/key_group.template b/robot/assets/templates/asdc/key_group.template
index 2081261..2d194dc 100644
--- a/robot/assets/templates/asdc/key_group.template
+++ b/robot/assets/templates/asdc/key_group.template
@@ -1,11 +1,10 @@
{
- "name": "${key_group_name}",
- "description": "vendor license key group",
- "operationalScope": {
- "choices": [
- "Tenant"
- ],
- "other": ""
- },
- "type": "Universal"
-}
\ No newline at end of file
+ "name": "${key_group_name}",
+ "description": "vendor license key group",
+ "type": "Universal",
+ "thresholdValue": "100",
+ "thresholdUnits": "Percentage",
+ "startDate": "${license_start_date}",
+ "expiryDate": "${license_end_date}",
+ "manufacturerReferenceNumber": "11111"
+}