From 2d14c266ad9452c5cb2c9ed2c3cd78ad8bf8de08 Mon Sep 17 00:00:00 2001
From: Manoj Kumar <manojkr.itbhu@gmail.com>
Date: Thu, 16 Apr 2026 12:16:40 +0530
Subject: [PATCH] rename credentials param in dns server vue files to apikey

---
 .../smoke/test_dns_framework_powerdns.py           |  1 -
 ui/public/locales/en.json                          |  4 ++--
 ui/src/views/network/dns/AddDnsServer.vue          | 14 +++++++-------
 ui/src/views/network/dns/UpdateDnsServer.vue       | 10 +++++-----
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/test/integration/smoke/test_dns_framework_powerdns.py b/test/integration/smoke/test_dns_framework_powerdns.py
index 627ae444a24..68d42c7f5fa 100644
--- a/test/integration/smoke/test_dns_framework_powerdns.py
+++ b/test/integration/smoke/test_dns_framework_powerdns.py
@@ -316,4 +316,3 @@ class TestCloudStackDNSFramework(cloudstackTestCase):
         cmd.description = "Test DNS Zone for PDNS"
 
         return self.api_client.createDnsZone(cmd)
-    
\ No newline at end of file
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index b9b493097b0..257d87637ad 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -952,10 +952,10 @@
 "label.dns": "DNS",
 "label.dns1": "DNS 1",
 "label.dns2": "DNS 2",
-"label.dns.create.record": "Create DNS Record",
 "label.dns.add.server": "Add DNS Server",
+"label.dns.apikey": "DNS API key",
+"label.dns.create.record": "Create DNS Record",
 "label.dns.create.zone": "Create DNS Zone",
-"label.dns.credentials": "DNS API key", 
 "label.dns.delete.server": "Delete DNS Server",
 "label.dns.delete.zone": "Delete DNS Zone",
 "label.dns.externalserverid": "DNS server ID",
diff --git a/ui/src/views/network/dns/AddDnsServer.vue b/ui/src/views/network/dns/AddDnsServer.vue
index 972b3490b6e..d71ab64f5bb 100644
--- a/ui/src/views/network/dns/AddDnsServer.vue
+++ b/ui/src/views/network/dns/AddDnsServer.vue
@@ -80,15 +80,15 @@
             style="width: 100%" />
         </a-form-item>
 
-        <a-form-item name="credentials" ref="credentials">
+        <a-form-item name="apikey" ref="apikey">
           <template #label>
             <tooltip-label
-              :title="$t('label.dns.credentials')"
-              :tooltip="apiParams.credentials?.description" />
+              :title="$t('label.dns.apikey')"
+              :tooltip="apiParams.apikey?.description" />
           </template>
           <a-input-password
-            v-model:value="form.credentials"
-            :placeholder="apiParams.credentials?.description || 'Enter API Key'" />
+            v-model:value="form.apikey"
+            :placeholder="apiParams.apikey?.description || 'Enter API Key'" />
         </a-form-item>
 
         <a-form-item name="externalserverid" ref="externalserverid">
@@ -192,7 +192,7 @@ export default {
         { validator: this.validatePort }
       ],
       provider: [{ required: true, message: this.$t('message.error.required.input') }],
-      credentials: [{ required: true, message: this.$t('message.error.required.input') }],
+      apikey: [{ required: true, message: this.$t('message.error.required.input') }],
       externalserverid: [{ required: true, message: this.$t('message.error.required.input') }],
       nameservers: [
         { required: true, type: 'array', min: 1, message: this.$t('message.error.required.input') },
@@ -220,7 +220,7 @@ export default {
           url: this.form.url?.trim().replace(/\/$/, ''),
           port: this.form.port,
           provider: this.form.provider,
-          credentials: this.form.credentials,
+          apikey: this.form.apikey.trim(),
           externalserverid: this.form.externalserverid.trim(),
           nameservers: this.form.nameservers?.map(ns => ns.toLowerCase().trim()).filter(Boolean),
           ispublic: this.form.ispublic
diff --git a/ui/src/views/network/dns/UpdateDnsServer.vue b/ui/src/views/network/dns/UpdateDnsServer.vue
index 08dc87b9b48..facf745c42e 100644
--- a/ui/src/views/network/dns/UpdateDnsServer.vue
+++ b/ui/src/views/network/dns/UpdateDnsServer.vue
@@ -60,11 +60,11 @@
             style="width: 100%" />
         </a-form-item>
 
-        <a-form-item name="credentials">
+        <a-form-item name="apikey">
           <template #label>
-            <tooltip-label :title="$t('label.dns.credentials')" :tooltip="apiParams.credentials?.description" />
+            <tooltip-label :title="$t('label.dns.apikey')" :tooltip="apiParams.apikey?.description" />
           </template>
-          <a-input-password v-model:value="form.credentials" :placeholder="apiParams.credentials?.description" />
+          <a-input-password v-model:value="form.apikey" :placeholder="apiParams.apikey?.description" />
         </a-form-item>
 
         <a-form-item v-if="isAdminOrDomainAdmin()" name="publicdomainsuffix">
@@ -186,8 +186,8 @@ export default {
           ispublic: this.form.ispublic,
           state: this.form.state
         }
-        if (this.form.credentials) {
-          params.credentials = this.form.credentials
+        if (this.form.apikey) {
+          params.apikey = this.form.apikey.trim()
         }
         if (this.form.ispublic) {
           params.publicdomainsuffix = this.form.publicdomainsuffix?.trim().toLowerCase()