From 352b46cf2f81d01c437ff5d5020be1e954fd6d04 Mon Sep 17 00:00:00 2001
From: Xie Zheng <xizheng@vmware.com>
Date: Fri, 23 Feb 2024 11:31:30 +0800
Subject: [PATCH] Implement image fetcher feature

Sync nsx.vmware.com/node-id annotation of subnetport with nsx-t.
Sync wcp.vmware.com/image-fetcher: "true" and namespace_uid label of subnetport with tags of nsx-t.

Signed-off-by: Xie Zheng <xizheng@vmware.com>
---
 pkg/nsx/services/securitypolicy/builder_test.go  | 8 --------
 pkg/nsx/services/securitypolicy/firewall_test.go | 5 -----
 2 files changed, 13 deletions(-)

diff --git a/pkg/nsx/services/securitypolicy/builder_test.go b/pkg/nsx/services/securitypolicy/builder_test.go
index b79d40a2c..3c7f83ccd 100644
--- a/pkg/nsx/services/securitypolicy/builder_test.go
+++ b/pkg/nsx/services/securitypolicy/builder_test.go
@@ -231,10 +231,6 @@ func TestBuildTargetTags(t *testing.T) {
 					Scope: &tagScopeNamespace,
 					Tag:   &tagValueNS,
 				},
-				{
-					Scope: &tagScopeNamespaceUID,
-					Tag:   &tagValueNSUID,
-				},
 				{
 					Scope: &tagScopeSecurityPolicyCRName,
 					Tag:   &tagValuePolicyCRName,
@@ -300,10 +296,6 @@ func TestBuildPeerTags(t *testing.T) {
 					Scope: &tagScopeNamespace,
 					Tag:   &tagValueNS,
 				},
-				{
-					Scope: &tagScopeNamespaceUID,
-					Tag:   &tagValueNSUID,
-				},
 				{
 					Scope: &tagScopeSecurityPolicyCRName,
 					Tag:   &tagValuePolicyCRName,
diff --git a/pkg/nsx/services/securitypolicy/firewall_test.go b/pkg/nsx/services/securitypolicy/firewall_test.go
index 26979724c..e30dd8e22 100644
--- a/pkg/nsx/services/securitypolicy/firewall_test.go
+++ b/pkg/nsx/services/securitypolicy/firewall_test.go
@@ -30,7 +30,6 @@ var (
 	tagScopeGroupType            = common.TagScopeGroupType
 	tagScopeCluster              = common.TagScopeCluster
 	tagScopeNamespace            = common.TagScopeNamespace
-	tagScopeNamespaceUID         = common.TagScopeNamespaceUID
 	tagScopeSecurityPolicyCRName = common.TagValueScopeSecurityPolicyName
 	tagScopeSecurityPolicyCRUID  = common.TagValueScopeSecurityPolicyUID
 	tagScopeRuleID               = common.TagScopeRuleID
@@ -263,10 +262,6 @@ var (
 			Scope: &tagScopeNamespace,
 			Tag:   &tagValueNS,
 		},
-		{
-			Scope: &tagScopeNamespaceUID,
-			Tag:   &tagValueNSUID,
-		},
 		{
 			Scope: &tagScopeSecurityPolicyCRName,
 			Tag:   &tagValuePolicyCRName,