From a557dbd97e13144591bfc79b3927d48140473af1 Mon Sep 17 00:00:00 2001 From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com> Date: Tue, 1 Jun 2021 10:18:26 -0700 Subject: [PATCH] [multi-asic][vs]: Add context_config.json files for multi-asic vs (#7697) hwskus. Why I did it For multi-asic platforms, orchagent process in swss docker is started by passing device_ids(or asic_ids). Each swss docker starts orchagent with a different device_id. This device_id is passed as Hardware info to syncd. For syncd to start with the right hwinfo, context_config.json is passed as an argument. context_config.json file is looked up to get the hwinfo information. sonic-sairedis PRs required for this diff to be used to bring up multi-asic VS: Azure/sonic-sairedis#830 Azure/sonic-sairedis#832 How I did it Add context_config.json for each asic in the same structure as provided here: https://github.com/Azure/sonic-sairedis/blob/master/lib/src/context_config.json Each asic context_config.json will have different hwinfo string. hwinfo string will be same as device id retrieved from asic.conf file. Signed-off-by: Suvarna Meenakshi --- .../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 insertions(+) create mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/context_config.json create mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/context_config.json create mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/context_config.json create mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/context_config.json create mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/context_config.json create mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/context_config.json create mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/context_config.json create mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/context_config.json create mode 100644 device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/context_config.json create 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 new file mode 100644 index 0000000000..bf8d2f4975 --- /dev/null +++ b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/context_config.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000000..0dcc997c92 --- /dev/null +++ b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/context_config.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000000..e4541b0c7b --- /dev/null +++ b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/context_config.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000000..e32691dc1f --- /dev/null +++ b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/context_config.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000000..bf8d2f4975 --- /dev/null +++ b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/context_config.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000000..0dcc997c92 --- /dev/null +++ b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/context_config.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000000..e4541b0c7b --- /dev/null +++ b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/context_config.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000000..e32691dc1f --- /dev/null +++ b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/context_config.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000000..6517d04693 --- /dev/null +++ b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/context_config.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000000..2aa18004ea --- /dev/null +++ b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/context_config.json @@ -0,0 +1,21 @@ +{ + "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" + } + ] + } + ] +}