From 57425ba43819e4d5a85fdadb0bf6e7ab8d7201f4 Mon Sep 17 00:00:00 2001
From: Andrew Hartpence <andrew@ip-10-4-0-43.us-west-2.compute.internal>
Date: Thu, 24 Mar 2022 18:44:14 +0000
Subject: [PATCH] Fix windows diego cell features

[Bug Fixes]

* Support for bosh-dns-alias to support windows2019 cells
* Added the errand for smoke_tests_windows in addition to the existing smoke_tests
* Fix for NFS networking
---
 hooks/blueprint                       | 8 +++++---
 overlay/addons/nfs-volume-service.yml | 1 +
 overlay/windows.yml                   | 7 ++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/hooks/blueprint b/hooks/blueprint
index 8cf82e34..3739ce0f 100755
--- a/hooks/blueprint
+++ b/hooks/blueprint
@@ -542,10 +542,11 @@ if ! want_feature "bare" ; then
       [[ $inst_grp == "loggregator" ]] && inst_grp="log_api" && echo >&2 "WARNING: params.loggregator_instances has been translated as params.log_api_instances";
       [[ $inst_grp == "postgres" ]]    && inst_grp="database" && echo >&2 "WARNING: params.postgres_instances has been translated as params.database_instances";
       [[ $inst_grp == "blobstore" ]]   && inst_grp="singleton-blobstore" && echo >&2 "WARNING: params.blobstore_instances has been translated as params.singleton_blobstore_instances";
+      [[ $inst_grp == "windows_diego_cell" ]]     && inst_grp="windows2019-cell" && echo >&2 "WARNING: params.windows_diego_cell_instances has been translated as params.windows2019-cell_instances";
 
       dashed_inst_grp="$(echo "$inst_grp" | tr _ -)" # convert any _ into -
       found=''
-      if [[ $dashed_inst_grp =~ ^(api|cc-worker|credhub|database|diego-(api|cell)|doppler|errand|haproxy|log-api|nats|rotate-cc-database-key|(tcp-)?router|scheduler|singleton-blobstore|smoke-tests|uaa)$ ]] ; then
+      if [[ $dashed_inst_grp =~ ^(api|cc-worker|credhub|database|diego-(api|cell)|doppler|errand|haproxy|log-api|nats|windows2019-cell|rotate-cc-database-key|(tcp-)?router|scheduler|singleton-blobstore|smoke-tests|uaa)$ ]] ; then
         inst_grp="$dashed_inst_grp";
         found=1
       fi
@@ -609,10 +610,11 @@ EOF
       [[ $inst_grp == "loggregator" ]] && inst_grp="log_api" && echo >&2 "WARNING: params.loggregator_vm_type has been translated as params.log_api_vm_type";
       [[ $inst_grp == "postgres" ]]    && inst_grp="database" && echo >&2 "WARNING: params.postgres_vm_type has been translated as params.database_vm_type";
       [[ $inst_grp == "blobstore" ]]   && inst_grp="singleton-blobstore" && echo >&2 "WARNING: params.blobstore_vm_type has been translated as params.singleton_blobstore_vm_type";
+      [[ $inst_grp == "windows_diego_cell" ]]     && inst_grp="windows2019-cell" && echo >&2 "WARNING: params.windows_diego_cell_vm_type has been translated as params.windows2019-cell_vm_type";
 
       dashed_inst_grp="$(echo "$inst_grp" | tr _ -)" # convert any _ into -
       found=''
-      if [[ $dashed_inst_grp =~ ^(api|cc-worker|credhub|database|diego-(api|cell)|doppler|errand|haproxy|log-api|nats|rotate-cc-database-key|(tcp-)?router|scheduler|singleton-blobstore|smoke-tests|uaa)$ ]] ; then
+      if [[ $dashed_inst_grp =~ ^(api|cc-worker|credhub|database|diego-(api|cell)|doppler|errand|haproxy|windows2019-cell|log-api|nats|rotate-cc-database-key|(tcp-)?router|scheduler|singleton-blobstore|smoke-tests|uaa)$ ]] ; then
         inst_grp="$dashed_inst_grp";
         found=1
       fi
@@ -628,7 +630,7 @@ EOF
           "        Expected instance groups are:" \
           "          api, cc-worker, credhub, database, diego-api, diego-cell, doppler," \
           "          errand, haproxy, log-api, nats, rotate-cc-database-key, router, scheduler," \
-          "          singleton-blobstore, smoke-tests, tcp-router, and uaa" ""
+          "          singleton-blobstore, smoke-tests, tcp-router, uaa, and windows2019-cell" ""
       fi
     done < <(echo "$instance_types")
 
diff --git a/overlay/addons/nfs-volume-service.yml b/overlay/addons/nfs-volume-service.yml
index dbcbb533..1c8c3679 100644
--- a/overlay/addons/nfs-volume-service.yml
+++ b/overlay/addons/nfs-volume-service.yml
@@ -1,5 +1,6 @@
 instance_groups:
 - name: nfs-broker-push
   networks:
+  - ((replace))
   - name: ((cf_runtime_network))
   azs: (( grab meta.azs ))
diff --git a/overlay/windows.yml b/overlay/windows.yml
index 674aca1c..7e0bf9bd 100644
--- a/overlay/windows.yml
+++ b/overlay/windows.yml
@@ -1,14 +1,15 @@
 instance_groups:
 - name: windows2019-cell
   vm_type: (( grab params.windows_diego_cell_vm_type || "small-highmem" ))
-  networks: ((cf_runtime_network))
-  instances: (( grab params.windows_diego_cell_instances || "1"))
+  networks:
+  - ((replace))
+  - name:  ((cf_runtime_network))
+  instances: (( grab params.windows_diego_cell_instances || 1))
   azs: (( grab meta.azs ))
   jobs:
   - name: resize_root_disk
     release: windows-resize-root-disk
     properties: {}
-
 releases:
 - name: windows-resize-root-disk
   version: "1.0"