AMS Providers' Specs Update for April Release (Azure#6972)

* added netweaver rfc specs and examples * removed password from get response * - add kv property * - add kv for password for Db2 provider * Adding new property Instance Number * - edit description * - fix description * renamed port nr prop * update ssl prop in netweaver * Swagger update for SSL for HANA Provider * updated the storage account uri example * updated description for the ssl certificate * trying something without secret * fixed pr comments * renamed keyvault password * udpated desc for db ssl * - update examples for "dbPasswordUri" for SapHana and Db2 * updated sapPasswordUri examples Co-authored-by: lharcekova <lharcekova@microsoft.com> Co-authored-by: Arvind Devalla <adevalla@microsoft.com>
leniatgh · Apr 22, 2022 · f114b85 · f114b85
1 parent 7a424bc
commit f114b85
Show file tree

Hide file tree

Showing 8 changed files with 108 additions and 13 deletions.
diff --git a/...oads/preview/2021-12-01-preview/examples/workloadmonitor/Db2ProviderInstances_Create.json b/...oads/preview/2021-12-01-preview/examples/workloadmonitor/Db2ProviderInstances_Create.json
@@ -14,6 +14,7 @@
           "dbUsername": "username",
           "dbName": "dbName",
           "dbPassword": "password",
+          "dbPasswordUri": "",
           "dbPort": "dbPort"
         }
       }
@@ -41,7 +42,8 @@
             "hostname": "vmname.azure.com",
             "dbUsername": "Db2OPA",
             "dbName": "OPA",
-            "dbPort": "5912"
+            "dbPort": "5912",
+            "dbPasswordUri": ""
           }
         }
       }
@@ -59,7 +61,8 @@
             "hostname": "vmname.azure.com",
             "dbUsername": "Db2OPA",
             "dbName": "OPA",
-            "dbPort": "5912"
+            "dbPort": "5912",
+            "dbPasswordUri": ""
           }
         }
       }

diff --git a/...rkloads/preview/2021-12-01-preview/examples/workloadmonitor/Db2ProviderInstances_Get.json b/...rkloads/preview/2021-12-01-preview/examples/workloadmonitor/Db2ProviderInstances_Get.json
@@ -28,7 +28,8 @@
             "hostname": "vmname.azure.com",
             "dbUsername": "Db2OPA",
             "dbName": "OPA",
-            "dbPort": "5912"
+            "dbPort": "5912",
+            "dbPasswordUri": ""
           }
         }
       }

diff --git a/...review/2021-12-01-preview/examples/workloadmonitor/NetWeaverProviderInstances_Create.json b/...review/2021-12-01-preview/examples/workloadmonitor/NetWeaverProviderInstances_Create.json
@@ -14,7 +14,13 @@
           "sapInstanceNr": "00",
           "sapHostFileEntries": [
             "127.0.0.1 name fqdn"
-          ]
+          ],
+          "sapUsername": "username",
+          "sapPassword": "****",
+          "sapPasswordUri": "",
+          "sapPortNumber": "1234",
+          "sapClientId": "111",
+          "sapSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
         }
       }
     }
@@ -42,7 +48,12 @@
             "sapInstanceNr": "00",
             "sapHostFileEntries": [
               "127.0.0.1 name fqdn"
-            ]
+            ],
+            "sapUsername": "username",
+            "sapPasswordUri": "",
+            "sapPortNumber": "1234",
+            "sapClientId": "111",
+            "sapSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
           }
         }
       }
@@ -61,7 +72,12 @@
             "sapInstanceNr": "00",
             "sapHostFileEntries": [
               "127.0.0.1 name fqdn"
-            ]
+            ],
+            "sapUsername": "username",
+            "sapPasswordUri": "",
+            "sapPortNumber": "1234",
+            "sapClientId": "111",
+            "sapSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
           }
         }
       }

diff --git a/...s/preview/2021-12-01-preview/examples/workloadmonitor/NetWeaverProviderInstances_Get.json b/...s/preview/2021-12-01-preview/examples/workloadmonitor/NetWeaverProviderInstances_Get.json
@@ -29,7 +29,12 @@
             "sapInstanceNr": "00",
             "sapHostFileEntries": [
               "127.0.0.1 name fqdn"
-            ]
+            ],
+            "sapUsername": "username",
+            "sapPasswordUri": "",
+            "sapPortNumber": "1234",
+            "sapClientId": "111",
+            "sapSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
           }
         }
       }

diff --git a/...rkloads/preview/2021-12-01-preview/examples/workloadmonitor/ProviderInstances_Create.json b/...rkloads/preview/2021-12-01-preview/examples/workloadmonitor/ProviderInstances_Create.json
@@ -12,8 +12,12 @@
           "hostname": "name",
           "dbName": "db",
           "sqlPort": "0000",
+          "instanceNumber": "00",
           "dbUsername": "user",
-          "dbPassword": "****"
+          "dbPassword": "****",
+          "dbPasswordUri": "",
+          "dbSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename",
+          "sslHostNameInCertificate": "xyz.domain.com"
         }
       }
     }
@@ -39,7 +43,11 @@
             "hostname": "name",
             "dbName": "db",
             "sqlPort": "0000",
-            "dbUsername": "user"
+            "instanceNumber": "00",
+            "dbUsername": "user",
+            "dbPasswordUri": "",
+            "sslHostNameInCertificate": "xyz.domain.com",
+            "dbSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
           }
         }
       }
@@ -56,7 +64,11 @@
             "hostname": "name",
             "dbName": "db",
             "sqlPort": "0000",
-            "dbUsername": "user"
+            "instanceNumber": "00",
+            "dbUsername": "user",
+            "dbPasswordUri": "",
+            "sslHostNameInCertificate": "xyz.domain.com",
+            "dbSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
           }
         }
       }

diff --git a/....Workloads/preview/2021-12-01-preview/examples/workloadmonitor/ProviderInstances_Get.json b/....Workloads/preview/2021-12-01-preview/examples/workloadmonitor/ProviderInstances_Get.json
@@ -27,7 +27,11 @@
             "hostname": "name",
             "dbName": "db",
             "sqlPort": "0000",
-            "dbUsername": "user"
+            "instanceNumber": "00",
+            "dbUsername": "user",
+            "dbPasswordUri": "",
+            "sslHostNameInCertificate": "xyz.domain.com",
+            "dbSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
           }
         }
       }

diff --git a/...Workloads/preview/2021-12-01-preview/examples/workloadmonitor/ProviderInstances_List.json b/...Workloads/preview/2021-12-01-preview/examples/workloadmonitor/ProviderInstances_List.json
@@ -20,7 +20,11 @@
                 "hostname": "name",
                 "dbName": "db",
                 "sqlPort": "0000",
-                "dbUsername": "user"
+                "instanceNumber": "00",
+                "dbUsername": "user",
+                "dbPasswordUri": "",
+                "sslHostNameInCertificate": "xyz.domain.com",
+                "dbSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
               }
             }
           },
@@ -37,7 +41,12 @@
                 "sapInstanceNr": "00",
                 "sapHostFileEntries": [
                   "127.0.0.1 name fqdn"
-                ]
+                ],
+                "sapUsername": "username",
+                "sapPasswordUri": "",
+                "sapPortNumber": "1234",
+                "sapClientId": "111",
+                "sapSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
               }
             }
           },

diff --git a/...n/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/monitors.json b/...n/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/monitors.json
@@ -876,6 +876,10 @@
           "description": "Gets or sets the database sql port.",
           "type": "string"
         },
+        "instanceNumber": {
+          "description": "Gets or sets the database instance number.",
+          "type": "string"
+        },
         "dbUsername": {
           "description": "Gets or sets the database user name.",
           "type": "string"
@@ -884,6 +888,18 @@
           "description": "Gets or sets the database password.",
           "type": "string",
           "x-ms-secret": true
+        },
+        "dbPasswordUri": {
+          "description": "Gets or sets the key vault URI to secret with the database password.",
+          "type": "string"
+        },
+        "dbSslCertificateUri": {
+          "description": "Gets or sets the blob URI to SSL certificate for the DB.",
+          "type": "string"
+        },
+        "sslHostNameInCertificate": {
+          "description": "Gets or sets the hostname(s) in the SSL certificate.",
+          "type": "string"
         }
       },
       "x-ms-discriminator-value": "SapHana"
@@ -915,6 +931,31 @@
           "items": {
             "type": "string"
           }
+        },
+        "sapUsername": {
+          "description": "Gets or sets the SAP user name.",
+          "type": "string"
+        },
+        "sapPassword": {
+          "description": "Sets the SAP password.",
+          "type": "string",
+          "x-ms-secret": true
+        },
+        "sapPasswordUri": {
+          "description": "Gets or sets the key vault URI to secret with the SAP password.",
+          "type": "string"
+        },
+        "sapClientId": {
+          "description": "Gets or sets the SAP Client ID.",
+          "type": "string"
+        },
+        "sapPortNumber": {
+          "description": "Gets or sets the SAP HTTP port number.",
+          "type": "string"
+        },
+        "sapSslCertificateUri": {
+          "description": "Gets or sets the blob URI to SSL certificate for the SAP system.",
+          "type": "string"
         }
       },
       "x-ms-discriminator-value": "SapNetWeaver"
@@ -965,6 +1006,10 @@
           "type": "string",
           "x-ms-secret": true
         },
+        "dbPasswordUri": {
+          "description": "Gets or sets the key vault URI to secret with the database password.",
+          "type": "string"
+        },
         "sapSid": {
           "description": "Gets or sets the SAP System Identifier",
           "type": "string"