From 0395bba14f60082024a7e36647ba82cdfff8afce Mon Sep 17 00:00:00 2001
From: Rakesh Venkatesh <rakeshv.com@gmail.com>
Date: Thu, 5 Nov 2020 11:31:50 +0100
Subject: [PATCH] Make internaldns1 optional for zone creation

As of now internaldns1 is mandatory field while creating
a zone. Sometimes we dont have internaldns1 and so make
this field as optional
---
 .../cloudstack/api/command/admin/zone/CreateZoneCmd.java      | 2 +-
 .../java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java  | 4 +++-
 .../secondarystorage/SecondaryStorageManagerImpl.java         | 4 +++-
 ui/scripts/system.js                                          | 3 ---
 ui/scripts/zoneWizard.js                                      | 1 -
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
index 414c058e66df..15f228b168cb 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
@@ -58,7 +58,7 @@ public class CreateZoneCmd extends BaseCmd {
     @Parameter(name = ApiConstants.GUEST_CIDR_ADDRESS, type = CommandType.STRING, description = "the guest CIDR address for the Zone")
     private String guestCidrAddress;
 
-    @Parameter(name = ApiConstants.INTERNAL_DNS1, type = CommandType.STRING, required = true, description = "the first internal DNS for the Zone")
+    @Parameter(name = ApiConstants.INTERNAL_DNS1, type = CommandType.STRING, description = "the first internal DNS for the Zone")
     private String internalDns1;
 
     @Parameter(name = ApiConstants.INTERNAL_DNS2, type = CommandType.STRING, description = "the second internal DNS for the Zone")
diff --git a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index b0eac2bcf448..36a9c45e6cee 100644
--- a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -1418,7 +1418,9 @@ public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, Depl
             buf.append(" bootproto=dhcp");
         }
         DataCenterVO dc = _dcDao.findById(profile.getVirtualMachine().getDataCenterId());
-        buf.append(" internaldns1=").append(dc.getInternalDns1());
+        if (dc.getInternalDns1() != null) {
+            buf.append(" internaldns1=").append(dc.getInternalDns1());
+        }
         if (dc.getInternalDns2() != null) {
             buf.append(" internaldns2=").append(dc.getInternalDns2());
         }
diff --git a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 5ee60eb7e039..3826822b3f4b 100644
--- a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -1198,7 +1198,9 @@ public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, Depl
         }
 
         DataCenterVO dc = _dcDao.findById(profile.getVirtualMachine().getDataCenterId());
-        buf.append(" internaldns1=").append(dc.getInternalDns1());
+        if (dc.getInternalDns1() != null) {
+            buf.append(" internaldns1=").append(dc.getInternalDns1());
+        }
         if (dc.getInternalDns2() != null) {
             buf.append(" internaldns2=").append(dc.getInternalDns2());
         }
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index ca0eb7e3aeb7..9e646dde6bb3 100755
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -8529,9 +8529,6 @@
                                             internaldns1: {
                                                 label: 'label.internal.dns.1',
                                                 isEditable: true,
-                                                validation: {
-                                                    required: true
-                                                }
                                             },
                                             internaldns2: {
                                                 label: 'label.internal.dns.2',
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index b7e5d019ce5d..558ad7d2909f 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -488,7 +488,6 @@
                     internaldns1: {
                         label: 'label.internal.dns.1',
                         validation: {
-                            required: true,
                             ipv4: true
                         },
                         desc: 'message.tooltip.internal.dns.1'