From 7c07bfe01d77d93e643c5f10232addde3d27a86a Mon Sep 17 00:00:00 2001
From: Jason Morris <10388115+morris-jason@users.noreply.github.com>
Date: Tue, 24 Apr 2018 11:51:42 -0500
Subject: [PATCH] Rename ovf keys for registry port (#1642)

Changes the ovf key names for management_portal.port and
registry.port so they do not conflict on the HTML5 client in
vSphere 6.7. Fixes #1624.
---
 installer/build/bootable/config/builder.ovf                   | 4 ++--
 .../scripts/systemd/scripts/vic-appliance-environment.sh      | 4 ++--
 installer/docs/BUILD.md                                       | 4 ++--
 installer/fileserver/server.go                                | 2 +-
 installer/fileserver/tasks.go                                 | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/installer/build/bootable/config/builder.ovf b/installer/build/bootable/config/builder.ovf
index f8e907cd89..e710e80c54 100644
--- a/installer/build/bootable/config/builder.ovf
+++ b/installer/build/bootable/config/builder.ovf
@@ -246,7 +246,7 @@ EVALUATION LICENSE. If You are licensing the Software for evaluation purposes, Y
     <ProductSection ovf:class="registry" ovf:required="false">
       <Info>Registry Properties</Info>
       <Category>3. Registry Configuration</Category>
-      <Property ovf:key="port" ovf:qualifiers="MinValue(1),MaxValue(65535)" ovf:type="int" ovf:userConfigurable="true" ovf:value="443">
+      <Property ovf:key="registry_port" ovf:qualifiers="MinValue(1),MaxValue(65535)" ovf:type="int" ovf:userConfigurable="true" ovf:value="443">
         <Label>3.1. Registry Port</Label>
         <Description>Specifies the port on which registry will be published.</Description>
       </Property>
@@ -262,7 +262,7 @@ EVALUATION LICENSE. If You are licensing the Software for evaluation purposes, Y
     <ProductSection ovf:class="management_portal" ovf:required="false">
       <Info>Management Portal Properties</Info>
       <Category>4. Management Portal Configuration</Category>
-      <Property ovf:key="port" ovf:qualifiers="MinValue(1),MaxValue(65535)" ovf:type="int" ovf:userConfigurable="true" ovf:value="8282">
+      <Property ovf:key="management_portal_port" ovf:qualifiers="MinValue(1),MaxValue(65535)" ovf:type="int" ovf:userConfigurable="true" ovf:value="8282">
         <Label>4.1. Management Portal Port</Label>
         <Description>Specifies the port on which Management Portal will be published.</Description>
       </Property>
diff --git a/installer/build/scripts/systemd/scripts/vic-appliance-environment.sh b/installer/build/scripts/systemd/scripts/vic-appliance-environment.sh
index 55198d4513..5e71413a45 100755
--- a/installer/build/scripts/systemd/scripts/vic-appliance-environment.sh
+++ b/installer/build/scripts/systemd/scripts/vic-appliance-environment.sh
@@ -23,8 +23,8 @@ APPLIANCE_TLS_CERT="$(ovfenv -k appliance.tls_cert | sed -E ':a;N;$!ba;s/\r{0,1}
 APPLIANCE_TLS_PRIVATE_KEY="$(ovfenv -k appliance.tls_cert_key | sed -E ':a;N;$!ba;s/\r{0,1}\n//g')"
 APPLIANCE_TLS_CA_CERT="$(ovfenv -k appliance.ca_cert | sed -E ':a;N;$!ba;s/\r{0,1}\n//g')"
 
-ADMIRAL_PORT="$(ovfenv -k management_portal.port)"
-REGISTRY_PORT="$(ovfenv -k registry.port)"
+ADMIRAL_PORT="$(ovfenv -k management_portal.management_portal_port)"
+REGISTRY_PORT="$(ovfenv -k registry.registry_port)"
 NOTARY_PORT="$(ovfenv -k registry.notary_port)"
 FILESERVER_PORT="$(ovfenv -k appliance.config_port)"
 HOSTNAME=""
diff --git a/installer/docs/BUILD.md b/installer/docs/BUILD.md
index 59d71594e8..788b64702c 100644
--- a/installer/docs/BUILD.md
+++ b/installer/docs/BUILD.md
@@ -112,8 +112,8 @@ docker run -it --net=host -v $GOPATH/src/github.com/vmware/vic-product/installer
   --net:Network="VM Network" \
   --prop:appliance.root_pwd="password" \
   --prop:appliance.permit_root_login=True \
-  --prop:management_portal.port=8282 \
-  --prop:registry.port=443 \
+  --prop:management_portal.management_portal_port=8282 \
+  --prop:registry.registry_port=443 \
   /test-bin/$(ls -1t bin | grep "\.ova") \
   vi://$VC_USER:$VC_PASSWORD@$VC_IP/$VC_COMPUTE
 ```
diff --git a/installer/fileserver/server.go b/installer/fileserver/server.go
index 34e50be31b..37631f6b2e 100644
--- a/installer/fileserver/server.go
+++ b/installer/fileserver/server.go
@@ -142,7 +142,7 @@ func Init(conf *config) {
 
 	if ip, err := ip.FirstIPv4(ip.Eth0Interface); err == nil {
 		conf.serverHostname = getHostname(ovf, ip)
-		if port, ok := ovf.Properties["management_portal.port"]; ok {
+		if port, ok := ovf.Properties["management_portal.management_portal_port"]; ok {
 			conf.admiralPort = port
 		}
 	}
diff --git a/installer/fileserver/tasks.go b/installer/fileserver/tasks.go
index 2771811ae5..3a2a715a27 100644
--- a/installer/fileserver/tasks.go
+++ b/installer/fileserver/tasks.go
@@ -74,7 +74,7 @@ func registerWithPSC(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	admiralPort := ovf.Properties["management_portal.port"]
+	admiralPort := ovf.Properties["management_portal.management_portal_port"]
 
 	// Out of the box users
 	defCreateUsers, foundCreateUsers := ovf.Properties["default_users.create_def_users"]