From a89643d5f2ac6c3f7b9a716171a0fee58f97a1b9 Mon Sep 17 00:00:00 2001
From: Judy Joseph <judy.joseph@microsoft.com>
Date: Thu, 22 Oct 2020 15:55:03 -0700
Subject: [PATCH] Remove sub_role from "general" profile based tests

---
 .../tests/data/general/instance.conf/param_all_v4.json       | 5 -----
 .../tests/data/general/instance.conf/param_all_v6.json       | 5 -----
 .../tests/data/general/peer-group.conf/param_base.json       | 3 +--
 .../tests/data/general/policies.conf/param_all.json          | 5 -----
 .../tests/data/general/policies.conf/param_base.json         | 5 -----
 .../tests/data/general/policies.conf/param_deny.json         | 5 -----
 6 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/sonic-bgpcfgd/tests/data/general/instance.conf/param_all_v4.json b/src/sonic-bgpcfgd/tests/data/general/instance.conf/param_all_v4.json
index 63123d457579..4afd00f38da1 100644
--- a/src/sonic-bgpcfgd/tests/data/general/instance.conf/param_all_v4.json
+++ b/src/sonic-bgpcfgd/tests/data/general/instance.conf/param_all_v4.json
@@ -1,9 +1,4 @@
 {
-    "CONFIG_DB__DEVICE_METADATA": {
-        "localhost": {
-            "sub_role": "FrontEnd"
-        }
-    },
     "neighbor_addr": "10.10.10.10",
     "bgp_session": {
         "asn": "555",
diff --git a/src/sonic-bgpcfgd/tests/data/general/instance.conf/param_all_v6.json b/src/sonic-bgpcfgd/tests/data/general/instance.conf/param_all_v6.json
index 942a6c9ad385..115f5a32c941 100644
--- a/src/sonic-bgpcfgd/tests/data/general/instance.conf/param_all_v6.json
+++ b/src/sonic-bgpcfgd/tests/data/general/instance.conf/param_all_v6.json
@@ -1,9 +1,4 @@
 {
-    "CONFIG_DB__DEVICE_METADATA": {
-        "localhost": {
-            "sub_role": "FrontEnd"
-        }
-    },
     "neighbor_addr": "fc::10",
     "bgp_session": {
         "asn": "555",
diff --git a/src/sonic-bgpcfgd/tests/data/general/peer-group.conf/param_base.json b/src/sonic-bgpcfgd/tests/data/general/peer-group.conf/param_base.json
index 669b8b80a36f..efee873fe726 100644
--- a/src/sonic-bgpcfgd/tests/data/general/peer-group.conf/param_base.json
+++ b/src/sonic-bgpcfgd/tests/data/general/peer-group.conf/param_base.json
@@ -1,8 +1,7 @@
 {
     "CONFIG_DB__DEVICE_METADATA": {
         "localhost": {
-            "type": "LeafRouter",
-            "sub_role": "FrontEnd"
+            "type": "LeafRouter"
         }
     },
     "CONFIG_DB__BGP_BBR": {
diff --git a/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_all.json b/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_all.json
index 7d1e010cf5b9..2ed388731ba0 100644
--- a/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_all.json
+++ b/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_all.json
@@ -1,9 +1,4 @@
 {
-    "CONFIG_DB__DEVICE_METADATA": {
-        "localhost": {
-            "sub_role": "FrontEnd"
-        }
-    },
     "loopback0_ipv4": "10.10.10.10/32",
     "constants": {
         "bgp": {
diff --git a/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_base.json b/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_base.json
index 958c9b0fbd4b..b752581e3096 100644
--- a/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_base.json
+++ b/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_base.json
@@ -1,9 +1,4 @@
 {
-    "CONFIG_DB__DEVICE_METADATA": {
-        "localhost": {
-            "sub_role": "NotBackEnd"
-        }
-    },
     "loopback0_ipv4": "10.10.10.10/32",
     "constants": {
         "bgp": {
diff --git a/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_deny.json b/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_deny.json
index 91cd1174b787..47cb93082041 100644
--- a/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_deny.json
+++ b/src/sonic-bgpcfgd/tests/data/general/policies.conf/param_deny.json
@@ -1,9 +1,4 @@
 {
-    "CONFIG_DB__DEVICE_METADATA": {
-        "localhost": {
-            "sub_role": "FrontEnd"
-        }
-    },
     "loopback0_ipv4": "10.10.10.10/32",
     "constants": {
         "bgp": {