From 621b6f11e228a51a541609dd6c39ff1a7c33db31 Mon Sep 17 00:00:00 2001
From: "Derek Lemon (delemon)" <delemon@cisco.com>
Date: Wed, 20 Mar 2019 07:46:11 -0600
Subject: [PATCH] Checking actual versus expected instead of pointer comparison

---
 upup/pkg/fi/cloudup/openstacktasks/subnet.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/upup/pkg/fi/cloudup/openstacktasks/subnet.go b/upup/pkg/fi/cloudup/openstacktasks/subnet.go
index 9afb3b6dd1..9c6c35ec22 100644
--- a/upup/pkg/fi/cloudup/openstacktasks/subnet.go
+++ b/upup/pkg/fi/cloudup/openstacktasks/subnet.go
@@ -105,28 +105,28 @@ func (s *Subnet) Run(context *fi.Context) error {
 	return fi.DefaultDeltaRunMethod(s, context)
 }
 
-func (_ *Subnet) CheckChanges(a, e, changes *Subnet) error {
-	if a == nil {
-		if e.Name == nil {
+func (_ *Subnet) CheckChanges(actual, expected, changes *Subnet) error {
+	if actual == nil {
+		if expected.Name == nil {
 			return fi.RequiredField("Name")
 		}
-		if e.Network == nil {
+		if expected.Network == nil {
 			return fi.RequiredField("Network")
 		}
-		if e.CIDR == nil {
+		if expected.CIDR == nil {
 			return fi.RequiredField("CIDR")
 		}
 	} else {
 		if changes.Name != nil {
 			return fi.CannotChangeField("Name")
 		}
-		if e.DNSServers != nil {
+		if changes.DNSServers != nil {
 			return fi.CannotChangeField("DNSServers")
 		}
-		if e.Network != nil {
+		if fi.StringValue(actual.Network.ID) != fi.StringValue(expected.Network.ID) {
 			return fi.CannotChangeField("Network")
 		}
-		if e.CIDR != nil {
+		if changes.CIDR != nil {
 			return fi.CannotChangeField("CIDR")
 		}
 	}