Native HANA consumption (#457)

AlexRieder · web-flow · commit 92fad4127955 · 2023-03-10T17:35:19.000+01:00
diff --git a/usecases/released/discoverycenter/3638-kyma-multitenant/parameters.json b/usecases/released/discoverycenter/3638-kyma-multitenant/parameters.json
@@ -3,7 +3,6 @@
   "usecasefile": "usecases/released/discoverycenter/3638-kyma-multitenant/usecase.json",
   "region": "us10",
   "subaccountname": "EasyFranchise",
-  "cfspacename": "hana",
   "loginmethod": "sso",
   "envvariables": {        
     "BTPSA_KYMA_IMAGE_NAME_APPROUTER": "ghcr.io/sap-samples/btp-kyma-multitenant-extension-approuter:main",
@@ -14,5 +13,13 @@
     "BTPSA_KYMA_IMAGE_NAME_EMAIL_SERVICE": "ghcr.io/sap-samples/btp-kyma-multitenant-extension-email-service:main",
     "BTPSA_KYMA_IMAGE_NAME_UI": "ghcr.io/sap-samples/btp-kyma-multitenant-extension-ui:main",
     "BTPSA_KYMA_IMAGE_NAME_BUSINESS_PARTNER_MOCK": "ghcr.io/sap-samples/btp-kyma-multitenant-extension-business-partner-mock:main"  
-  }
+  },
+  "myusergroups": [
+    {
+      "name": "admins",
+      "members": [ 
+        
+      ]
+    }
+  ]
 }
diff --git a/usecases/released/discoverycenter/3638-kyma-multitenant/usecase-customer-template.json b/usecases/released/discoverycenter/3638-kyma-multitenant/usecase-customer-template.json
@@ -14,6 +14,7 @@
         {
             "name": "easyfranchise-<provider-subdomain>",
             "plan": "default",
+            "targetenvironment": "sapbtp",
             "category": "APPLICATION",
             "repeatstatusrequest": 10,
             "repeatstatustimeout": 120,
diff --git a/usecases/released/discoverycenter/3638-kyma-multitenant/usecase.json b/usecases/released/discoverycenter/3638-kyma-multitenant/usecase.json
@@ -25,12 +25,14 @@
             "name": "destination",
             "plan": "lite",
             "entitleonly": true,
+            "targetenvironment": "sapbtp",
             "category": "SERVICE"
         },
         {
             "name": "xsuaa",
             "plan": "broker",
             "entitleonly": true,
+            "targetenvironment": "sapbtp",
             "category": "SERVICE"
         },
         {
@@ -40,6 +42,7 @@
             "repeatstatusrequest": 60,
             "repeatstatustimeout": 3600,
             "instancename": "EasyFranchiseHANADB",
+            "targetenvironment": "sapbtp",
             "parameters": {
                 "data": {
                     "edition": "cloud",
@@ -54,6 +57,22 @@
                     ]
                 }
             }
+        },
+        {
+            "name": "hana-cloud-tools",
+            "plan": "tools",
+            "targetenvironment": "sapbtp",
+            "category": "APPLICATION",
+            "repeatstatusrequest": 10,
+            "repeatstatustimeout": 120,
+            "requiredrolecollections": [
+                {
+                    "name": "SAP HANA Cloud Administrator",
+                    "assignedUserGroupsFromParameterFile": [
+                      "admins"
+                    ]
+                  }                
+            ]
         }
     ], 
     "executeAfterAccountSetup": [        
diff --git a/usecases/released/discoverycenter/3999-kyma-day2-operations/README.md b/usecases/released/discoverycenter/3999-kyma-day2-operations/README.md
@@ -61,6 +61,6 @@ Now run the main script `btpsa` with the following command:
 ./btpsa -parameterfile 'usecases/released/discoverycenter/3999-kyma-day2-operations/parameters.json' -globalaccount '<your global account subdomain as shown in the SAP BTP cockpit>' -myemail '<your email address>'
 ```
 
-> Note: Before the deployment starts you can choose between two options (Mission-start and Mission-end). The Mission-start option will setup the account and neccessary application in order to execute the mission and enhance the existing application with the day2 opteration features. The Mission-end option contains all tasks from the mission itself and you don't need to go through the mission steps. For the complete expirience it is recommended to choose the Mission-start option. 
+> Note: Before the deployment starts you can choose between two options (Mission-start and Mission-end). The Mission-start option will setup the account and necessary application in order to execute the mission and enhance the existing application with the day2 operation features. The Mission-end option contains all tasks from the mission itself and you don't need to go through the mission steps. For the complete experience it is recommended to choose the Mission-start option. 
 
 The btp-setup-automator script will now prepare your SAP BTP account to cover the discovery center mission. You can have a look at the [usecase.json](usecase.json) and [parameters.json](parameters.json) for more details about the used services and configuration parameters (e.g. DB Password for SAP HANA Cloud).
diff --git a/usecases/released/discoverycenter/3999-kyma-day2-operations/parameters.json b/usecases/released/discoverycenter/3999-kyma-day2-operations/parameters.json
@@ -3,7 +3,6 @@
   "usecasefile": "usecases/released/discoverycenter/3999-kyma-day2-operations/usecase.json",
   "region": "us10",
   "subaccountname": "EasyFranchise",
-  "cfspacename": "hana",
   "loginmethod": "sso",
   "envvariables": {
     "BTPSA_KYMA_IMAGE_TAG": "main",
@@ -21,8 +20,9 @@
   },
   "myusergroups": [
     {
-      "name": "admins",
-      "members": [        
+      "name": "admins",      
+      "members": [     
+           
       ]
     }
   ]
diff --git a/usecases/released/discoverycenter/3999-kyma-day2-operations/usecase-customer-template.json b/usecases/released/discoverycenter/3999-kyma-day2-operations/usecase-customer-template.json
@@ -14,6 +14,7 @@
         {
             "name": "easyfranchise-<provider-subdomain>",
             "plan": "default",
+            "targetenvironment": "sapbtp",
             "category": "APPLICATION",
             "repeatstatusrequest": 10,
             "repeatstatustimeout": 120,
diff --git a/usecases/released/discoverycenter/3999-kyma-day2-operations/usecase.json b/usecases/released/discoverycenter/3999-kyma-day2-operations/usecase.json
@@ -25,18 +25,21 @@
             "name": "destination",
             "plan": "lite",
             "entitleonly": true,
+            "targetenvironment": "sapbtp",
             "category": "SERVICE"
         },
         {
             "name": "xsuaa",
             "plan": "broker",
             "entitleonly": true,
+            "targetenvironment": "sapbtp",
             "category": "SERVICE"
         },
         {
             "name": "hana-cloud",
             "plan": "hana-free",
             "category": "SERVICE",
+            "targetenvironment": "sapbtp",
             "repeatstatusrequest": 60,
             "repeatstatustimeout": 3600,
             "instancename": "EasyFranchiseHANADB",
@@ -55,9 +58,26 @@
                 }
             }
         },
+        {
+            "name": "hana-cloud-tools",
+            "plan": "tools",
+            "targetenvironment": "sapbtp",
+            "category": "APPLICATION",
+            "repeatstatusrequest": 10,
+            "repeatstatustimeout": 120,
+            "requiredrolecollections": [
+                {
+                    "name": "SAP HANA Cloud Administrator",
+                    "assignedUserGroupsFromParameterFile": [
+                      "admins"
+                    ]
+                  }                
+            ]
+        },
         {
             "name": "cicd-app",
             "plan": "free",
+            "targetenvironment": "sapbtp",
             "category": "APPLICATION",
             "repeatstatusrequest": 10,
             "repeatstatustimeout": 120,
diff --git a/usecases/released/discoverycenter/4000-kyma-identity-management/parameters.json b/usecases/released/discoverycenter/4000-kyma-identity-management/parameters.json
@@ -3,7 +3,6 @@
   "usecasefile": "usecases/released/discoverycenter/4000-kyma-identity-management/usecase.json",
   "region": "us10",
   "subaccountname": "EasyFranchise",
-  "cfspacename": "hana",
   "loginmethod": "sso",
   "envvariables": {        
     "BTPSA_KYMA_IMAGE_NAME_APPROUTER": "ghcr.io/sap-samples/btp-kyma-identity-management-approuter:main",
@@ -14,5 +13,13 @@
     "BTPSA_KYMA_IMAGE_NAME_EMAIL_SERVICE": "ghcr.io/sap-samples/btp-kyma-identity-management-email-service:main",
     "BTPSA_KYMA_IMAGE_NAME_UI": "ghcr.io/sap-samples/btp-kyma-identity-management-ui:main",
     "BTPSA_KYMA_IMAGE_NAME_BUSINESS_PARTNER_MOCK": "ghcr.io/sap-samples/btp-kyma-identity-management-business-partner-mock:main"  
-  }
+  },
+  "myusergroups": [
+    {
+      "name": "admins",      
+      "members": [     
+           
+      ]
+    }
+  ]
 }
diff --git a/usecases/released/discoverycenter/4000-kyma-identity-management/usecase-customer-template.json b/usecases/released/discoverycenter/4000-kyma-identity-management/usecase-customer-template.json
@@ -14,6 +14,7 @@
         {
             "name": "easyfranchise-<provider-subdomain>",
             "plan": "default",
+            "targetenvironment": "sapbtp",
             "category": "APPLICATION",
             "repeatstatusrequest": 10,
             "repeatstatustimeout": 120,
diff --git a/usecases/released/discoverycenter/4000-kyma-identity-management/usecase.json b/usecases/released/discoverycenter/4000-kyma-identity-management/usecase.json
@@ -25,17 +25,20 @@
             "name": "destination",
             "plan": "lite",
             "entitleonly": true,
+            "targetenvironment": "sapbtp",
             "category": "SERVICE"
         },
         {
             "name": "xsuaa",
             "plan": "broker",
             "entitleonly": true,
+            "targetenvironment": "sapbtp",
             "category": "SERVICE"
         },
         {
             "name": "hana-cloud",
             "plan": "hana-free",
+            "targetenvironment": "sapbtp",
             "category": "SERVICE",
             "repeatstatusrequest": 60,
             "repeatstatustimeout": 3600,
@@ -54,6 +57,22 @@
                     ]
                 }
             }
+        },
+        {
+            "name": "hana-cloud-tools",
+            "plan": "tools",
+            "targetenvironment": "sapbtp",
+            "category": "APPLICATION",
+            "repeatstatusrequest": 10,
+            "repeatstatustimeout": 120,
+            "requiredrolecollections": [
+                {
+                    "name": "SAP HANA Cloud Administrator",
+                    "assignedUserGroupsFromParameterFile": [
+                      "admins"
+                    ]
+                  }                
+            ]
         }
     ],
     "executeAfterAccountSetup": [        

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`{`
`15`	`15`	`"name": "easyfranchise-<provider-subdomain>",`
`16`	`16`	`"plan": "default",`
	`17`	`+ "targetenvironment": "sapbtp",`
`17`	`18`	`"category": "APPLICATION",`
`18`	`19`	`"repeatstatusrequest": 10,`
`19`	`20`	`"repeatstatustimeout": 120,`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`"usecasefile": "usecases/released/discoverycenter/3999-kyma-day2-operations/usecase.json",`
`4`	`4`	`"region": "us10",`
`5`	`5`	`"subaccountname": "EasyFranchise",`
`6`		`- "cfspacename": "hana",`
`7`	`6`	`"loginmethod": "sso",`
`8`	`7`	`"envvariables": {`
`9`	`8`	`"BTPSA_KYMA_IMAGE_TAG": "main",`
`@@ -21,8 +20,9 @@`
`21`	`20`	`},`
`22`	`21`	`"myusergroups": [`
`23`	`22`	`{`
`24`		`- "name": "admins",`
`25`		`- "members": [`
	`23`	`+ "name": "admins",`
	`24`	`+ "members": [`
	`25`	`+`
`26`	`26`	`]`
`27`	`27`	`}`
`28`	`28`	`]`