From ba29bd60d2ff772d942d5543aeba95be92bcccf9 Mon Sep 17 00:00:00 2001 From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com> Date: Sun, 11 Jul 2021 15:00:04 -0700 Subject: [PATCH] Revert "[multi-asic][vs]: Add context_config.json files for multi-asic vs (#7697)" (#8147) This reverts commit a557dbd97e13144591bfc79b3927d48140473af1. Reverting this PR as it is not required currently for multi-asic VS. multi-asic VS will come up with multiple instances of swss and syncd. syncd will use default hwinfo string, same as in single asic VS. --- .../msft_four_asic_vs/0/context_config.json | 21 ------------------- .../msft_four_asic_vs/1/context_config.json | 21 ------------------- .../msft_four_asic_vs/2/context_config.json | 21 ------------------- .../msft_four_asic_vs/3/context_config.json | 21 ------------------- .../msft_multi_asic_vs/0/context_config.json | 21 ------------------- .../msft_multi_asic_vs/1/context_config.json | 21 ------------------- .../msft_multi_asic_vs/2/context_config.json | 21 ------------------- .../msft_multi_asic_vs/3/context_config.json | 21 ------------------- .../msft_multi_asic_vs/4/context_config.json | 21 ------------------- .../msft_multi_asic_vs/5/context_config.json | 21 ------------------- 10 files changed, 210 deletions(-) delete mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/context_config.json delete mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/context_config.json delete mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/context_config.json delete mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/context_config.json delete mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/context_config.json delete mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/context_config.json delete mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/context_config.json delete mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/context_config.json delete mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/context_config.json delete mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/context_config.json diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/context_config.json b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/context_config.json deleted file mode 100644 index bf8d2f497567..000000000000 --- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/context_config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "CONTEXTS": [ - { - "guid" : 0, - "name" : "syncd0", - "dbAsic" : "ASIC_DB", - "dbCounters" : "COUNTERS_DB", - "dbFlex": "FLEX_COUNTER_DB", - "dbState" : "STATE_DB", - "zmq_enable": false, - "zmq_endpoint": "tcp://127.0.0.1:5555", - "zmq_ntf_endpoint": "tcp://127.0.0.1:5556", - "switches": [ - { - "index" : 0, - "hwinfo" : "0" - } - ] - } - ] -} diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/context_config.json b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/context_config.json deleted file mode 100644 index 0dcc997c9259..000000000000 --- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/context_config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "CONTEXTS": [ - { - "guid" : 0, - "name" : "syncd1", - "dbAsic" : "ASIC_DB", - "dbCounters" : "COUNTERS_DB", - "dbFlex": "FLEX_COUNTER_DB", - "dbState" : "STATE_DB", - "zmq_enable": false, - "zmq_endpoint": "tcp://127.0.0.1:5555", - "zmq_ntf_endpoint": "tcp://127.0.0.1:5556", - "switches": [ - { - "index" : 0, - "hwinfo" : "1" - } - ] - } - ] -} diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/context_config.json b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/context_config.json deleted file mode 100644 index e4541b0c7b90..000000000000 --- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/context_config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "CONTEXTS": [ - { - "guid" : 0, - "name" : "syncd2", - "dbAsic" : "ASIC_DB", - "dbCounters" : "COUNTERS_DB", - "dbFlex": "FLEX_COUNTER_DB", - "dbState" : "STATE_DB", - "zmq_enable": false, - "zmq_endpoint": "tcp://127.0.0.1:5555", - "zmq_ntf_endpoint": "tcp://127.0.0.1:5556", - "switches": [ - { - "index" : 0, - "hwinfo" : "2" - } - ] - } - ] -} diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/context_config.json b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/context_config.json deleted file mode 100644 index e32691dc1f35..000000000000 --- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/context_config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "CONTEXTS": [ - { - "guid" : 0, - "name" : "syncd3", - "dbAsic" : "ASIC_DB", - "dbCounters" : "COUNTERS_DB", - "dbFlex": "FLEX_COUNTER_DB", - "dbState" : "STATE_DB", - "zmq_enable": false, - "zmq_endpoint": "tcp://127.0.0.1:5555", - "zmq_ntf_endpoint": "tcp://127.0.0.1:5556", - "switches": [ - { - "index" : 0, - "hwinfo" : "3" - } - ] - } - ] -} diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/context_config.json b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/context_config.json deleted file mode 100644 index bf8d2f497567..000000000000 --- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/context_config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "CONTEXTS": [ - { - "guid" : 0, - "name" : "syncd0", - "dbAsic" : "ASIC_DB", - "dbCounters" : "COUNTERS_DB", - "dbFlex": "FLEX_COUNTER_DB", - "dbState" : "STATE_DB", - "zmq_enable": false, - "zmq_endpoint": "tcp://127.0.0.1:5555", - "zmq_ntf_endpoint": "tcp://127.0.0.1:5556", - "switches": [ - { - "index" : 0, - "hwinfo" : "0" - } - ] - } - ] -} diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/context_config.json b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/context_config.json deleted file mode 100644 index 0dcc997c9259..000000000000 --- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/context_config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "CONTEXTS": [ - { - "guid" : 0, - "name" : "syncd1", - "dbAsic" : "ASIC_DB", - "dbCounters" : "COUNTERS_DB", - "dbFlex": "FLEX_COUNTER_DB", - "dbState" : "STATE_DB", - "zmq_enable": false, - "zmq_endpoint": "tcp://127.0.0.1:5555", - "zmq_ntf_endpoint": "tcp://127.0.0.1:5556", - "switches": [ - { - "index" : 0, - "hwinfo" : "1" - } - ] - } - ] -} diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/context_config.json b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/context_config.json deleted file mode 100644 index e4541b0c7b90..000000000000 --- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/context_config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "CONTEXTS": [ - { - "guid" : 0, - "name" : "syncd2", - "dbAsic" : "ASIC_DB", - "dbCounters" : "COUNTERS_DB", - "dbFlex": "FLEX_COUNTER_DB", - "dbState" : "STATE_DB", - "zmq_enable": false, - "zmq_endpoint": "tcp://127.0.0.1:5555", - "zmq_ntf_endpoint": "tcp://127.0.0.1:5556", - "switches": [ - { - "index" : 0, - "hwinfo" : "2" - } - ] - } - ] -} diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/context_config.json b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/context_config.json deleted file mode 100644 index e32691dc1f35..000000000000 --- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/context_config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "CONTEXTS": [ - { - "guid" : 0, - "name" : "syncd3", - "dbAsic" : "ASIC_DB", - "dbCounters" : "COUNTERS_DB", - "dbFlex": "FLEX_COUNTER_DB", - "dbState" : "STATE_DB", - "zmq_enable": false, - "zmq_endpoint": "tcp://127.0.0.1:5555", - "zmq_ntf_endpoint": "tcp://127.0.0.1:5556", - "switches": [ - { - "index" : 0, - "hwinfo" : "3" - } - ] - } - ] -} diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/context_config.json b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/context_config.json deleted file mode 100644 index 6517d0469314..000000000000 --- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/context_config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "CONTEXTS": [ - { - "guid" : 0, - "name" : "syncd4", - "dbAsic" : "ASIC_DB", - "dbCounters" : "COUNTERS_DB", - "dbFlex": "FLEX_COUNTER_DB", - "dbState" : "STATE_DB", - "zmq_enable": false, - "zmq_endpoint": "tcp://127.0.0.1:5555", - "zmq_ntf_endpoint": "tcp://127.0.0.1:5556", - "switches": [ - { - "index" : 0, - "hwinfo" : "4" - } - ] - } - ] -} diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/context_config.json b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/context_config.json deleted file mode 100644 index 2aa18004ea31..000000000000 --- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/context_config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "CONTEXTS": [ - { - "guid" : 0, - "name" : "syncd5", - "dbAsic" : "ASIC_DB", - "dbCounters" : "COUNTERS_DB", - "dbFlex": "FLEX_COUNTER_DB", - "dbState" : "STATE_DB", - "zmq_enable": false, - "zmq_endpoint": "tcp://127.0.0.1:5555", - "zmq_ntf_endpoint": "tcp://127.0.0.1:5556", - "switches": [ - { - "index" : 0, - "hwinfo" : "5" - } - ] - } - ] -}