sonic-net · SuvarnaMeenakshi · Sep 1, 2021 · Jul 27, 2021 · Aug 5, 2021 · Aug 5, 2021
diff --git a/device/virtual/x86_64-mkvm_x86_64_4_asic-r0/asic.conf b/device/virtual/x86_64-mkvm_x86_64_4_asic-r0/asic.conf
@@ -0,0 +1 @@
+NUM_ASIC=4
diff --git a/device/virtual/x86_64-mkvm_x86_64_4_asic-r0/default_sku b/device/virtual/x86_64-mkvm_x86_64_4_asic-r0/default_sku
@@ -0,0 +1 @@
+msft_four_asic_vs
diff --git a/device/virtual/x86_64-mkvm_x86_64_4_asic-r0/installer.conf b/device/virtual/x86_64-mkvm_x86_64_4_asic-r0/installer.conf
@@ -0,0 +1 @@
+x86_64-kvm_x86_64-r0/installer.conf
diff --git a/...64-r0/msft_four_asic_vs/0/buffers.json.j2 → ...ic-r0/msft_four_asic_vs/0/buffers.json.j2 b/...64-r0/msft_four_asic_vs/0/buffers.json.j2 → ...ic-r0/msft_four_asic_vs/0/buffers.json.j2
diff --git a/...ft_four_asic_vs/0/buffers_defaults_def.j2 → ...ft_four_asic_vs/0/buffers_defaults_def.j2 b/...ft_four_asic_vs/0/buffers_defaults_def.j2 → ...ft_four_asic_vs/0/buffers_defaults_def.j2
diff --git a/...sft_four_asic_vs/0/buffers_defaults_t0.j2 → ...sft_four_asic_vs/0/buffers_defaults_t0.j2 b/...sft_four_asic_vs/0/buffers_defaults_t0.j2 → ...sft_four_asic_vs/0/buffers_defaults_t0.j2
diff --git a/...sft_four_asic_vs/0/buffers_defaults_t1.j2 → ...sft_four_asic_vs/0/buffers_defaults_t1.j2 b/...sft_four_asic_vs/0/buffers_defaults_t1.j2 → ...sft_four_asic_vs/0/buffers_defaults_t1.j2
diff --git a/...x86_64-r0/msft_four_asic_vs/0/lanemap.ini → ...4_asic-r0/msft_four_asic_vs/0/lanemap.ini b/...x86_64-r0/msft_four_asic_vs/0/lanemap.ini → ...4_asic-r0/msft_four_asic_vs/0/lanemap.ini
diff --git a/...msft_four_asic_vs/0/pg_profile_lookup.ini → ...msft_four_asic_vs/0/pg_profile_lookup.ini b/...msft_four_asic_vs/0/pg_profile_lookup.ini → ...msft_four_asic_vs/0/pg_profile_lookup.ini
diff --git a/...64-r0/msft_four_asic_vs/0/port_config.ini → ...ic-r0/msft_four_asic_vs/0/port_config.ini b/...64-r0/msft_four_asic_vs/0/port_config.ini → ...ic-r0/msft_four_asic_vs/0/port_config.ini
diff --git a/...x86_64-r0/msft_four_asic_vs/0/qos.json.j2 → ...4_asic-r0/msft_four_asic_vs/0/qos.json.j2 b/...x86_64-r0/msft_four_asic_vs/0/qos.json.j2 → ...4_asic-r0/msft_four_asic_vs/0/qos.json.j2
diff --git a/...x86_64-r0/msft_four_asic_vs/0/sai.profile → ...4_asic-r0/msft_four_asic_vs/0/sai.profile b/...x86_64-r0/msft_four_asic_vs/0/sai.profile → ...4_asic-r0/msft_four_asic_vs/0/sai.profile
diff --git a/...our_asic_vs/0/td2-s6000-32x40G.config.bcm → ...our_asic_vs/0/td2-s6000-32x40G.config.bcm b/...our_asic_vs/0/td2-s6000-32x40G.config.bcm → ...our_asic_vs/0/td2-s6000-32x40G.config.bcm
diff --git a/...64-r0/msft_four_asic_vs/1/buffers.json.j2 → ...ic-r0/msft_four_asic_vs/1/buffers.json.j2 b/...64-r0/msft_four_asic_vs/1/buffers.json.j2 → ...ic-r0/msft_four_asic_vs/1/buffers.json.j2
diff --git a/...ft_four_asic_vs/1/buffers_defaults_def.j2 → ...ft_four_asic_vs/1/buffers_defaults_def.j2 b/...ft_four_asic_vs/1/buffers_defaults_def.j2 → ...ft_four_asic_vs/1/buffers_defaults_def.j2
diff --git a/...sft_four_asic_vs/1/buffers_defaults_t0.j2 → ...sft_four_asic_vs/1/buffers_defaults_t0.j2 b/...sft_four_asic_vs/1/buffers_defaults_t0.j2 → ...sft_four_asic_vs/1/buffers_defaults_t0.j2
diff --git a/...sft_four_asic_vs/1/buffers_defaults_t1.j2 → ...sft_four_asic_vs/1/buffers_defaults_t1.j2 b/...sft_four_asic_vs/1/buffers_defaults_t1.j2 → ...sft_four_asic_vs/1/buffers_defaults_t1.j2
diff --git a/...x86_64-r0/msft_four_asic_vs/1/lanemap.ini → ...4_asic-r0/msft_four_asic_vs/1/lanemap.ini b/...x86_64-r0/msft_four_asic_vs/1/lanemap.ini → ...4_asic-r0/msft_four_asic_vs/1/lanemap.ini
diff --git a/...msft_four_asic_vs/1/pg_profile_lookup.ini → ...msft_four_asic_vs/1/pg_profile_lookup.ini b/...msft_four_asic_vs/1/pg_profile_lookup.ini → ...msft_four_asic_vs/1/pg_profile_lookup.ini
diff --git a/...64-r0/msft_four_asic_vs/1/port_config.ini → ...ic-r0/msft_four_asic_vs/1/port_config.ini b/...64-r0/msft_four_asic_vs/1/port_config.ini → ...ic-r0/msft_four_asic_vs/1/port_config.ini
diff --git a/...x86_64-r0/msft_four_asic_vs/1/qos.json.j2 → ...4_asic-r0/msft_four_asic_vs/1/qos.json.j2 b/...x86_64-r0/msft_four_asic_vs/1/qos.json.j2 → ...4_asic-r0/msft_four_asic_vs/1/qos.json.j2
diff --git a/...x86_64-r0/msft_four_asic_vs/1/sai.profile → ...4_asic-r0/msft_four_asic_vs/1/sai.profile b/...x86_64-r0/msft_four_asic_vs/1/sai.profile → ...4_asic-r0/msft_four_asic_vs/1/sai.profile
diff --git a/...our_asic_vs/1/td2-s6000-32x40G.config.bcm → ...our_asic_vs/1/td2-s6000-32x40G.config.bcm b/...our_asic_vs/1/td2-s6000-32x40G.config.bcm → ...our_asic_vs/1/td2-s6000-32x40G.config.bcm
diff --git a/...64-r0/msft_four_asic_vs/2/buffers.json.j2 → ...ic-r0/msft_four_asic_vs/2/buffers.json.j2 b/...64-r0/msft_four_asic_vs/2/buffers.json.j2 → ...ic-r0/msft_four_asic_vs/2/buffers.json.j2
diff --git a/...ft_four_asic_vs/2/buffers_defaults_def.j2 → ...ft_four_asic_vs/2/buffers_defaults_def.j2 b/...ft_four_asic_vs/2/buffers_defaults_def.j2 → ...ft_four_asic_vs/2/buffers_defaults_def.j2
diff --git a/...sft_four_asic_vs/2/buffers_defaults_t0.j2 → ...sft_four_asic_vs/2/buffers_defaults_t0.j2 b/...sft_four_asic_vs/2/buffers_defaults_t0.j2 → ...sft_four_asic_vs/2/buffers_defaults_t0.j2
diff --git a/...sft_four_asic_vs/2/buffers_defaults_t1.j2 → ...sft_four_asic_vs/2/buffers_defaults_t1.j2 b/...sft_four_asic_vs/2/buffers_defaults_t1.j2 → ...sft_four_asic_vs/2/buffers_defaults_t1.j2
diff --git a/...x86_64-r0/msft_four_asic_vs/2/lanemap.ini → ...4_asic-r0/msft_four_asic_vs/2/lanemap.ini b/...x86_64-r0/msft_four_asic_vs/2/lanemap.ini → ...4_asic-r0/msft_four_asic_vs/2/lanemap.ini
diff --git a/...msft_four_asic_vs/2/pg_profile_lookup.ini → ...msft_four_asic_vs/2/pg_profile_lookup.ini b/...msft_four_asic_vs/2/pg_profile_lookup.ini → ...msft_four_asic_vs/2/pg_profile_lookup.ini
diff --git a/...64-r0/msft_four_asic_vs/2/port_config.ini → ...ic-r0/msft_four_asic_vs/2/port_config.ini b/...64-r0/msft_four_asic_vs/2/port_config.ini → ...ic-r0/msft_four_asic_vs/2/port_config.ini
diff --git a/...x86_64-r0/msft_four_asic_vs/2/qos.json.j2 → ...4_asic-r0/msft_four_asic_vs/2/qos.json.j2 b/...x86_64-r0/msft_four_asic_vs/2/qos.json.j2 → ...4_asic-r0/msft_four_asic_vs/2/qos.json.j2
diff --git a/...x86_64-r0/msft_four_asic_vs/2/sai.profile → ...4_asic-r0/msft_four_asic_vs/2/sai.profile b/...x86_64-r0/msft_four_asic_vs/2/sai.profile → ...4_asic-r0/msft_four_asic_vs/2/sai.profile
diff --git a/...our_asic_vs/2/td2-s6000-32x40G.config.bcm → ...our_asic_vs/2/td2-s6000-32x40G.config.bcm b/...our_asic_vs/2/td2-s6000-32x40G.config.bcm → ...our_asic_vs/2/td2-s6000-32x40G.config.bcm
diff --git a/...64-r0/msft_four_asic_vs/3/buffers.json.j2 → ...ic-r0/msft_four_asic_vs/3/buffers.json.j2 b/...64-r0/msft_four_asic_vs/3/buffers.json.j2 → ...ic-r0/msft_four_asic_vs/3/buffers.json.j2
diff --git a/...ft_four_asic_vs/3/buffers_defaults_def.j2 → ...ft_four_asic_vs/3/buffers_defaults_def.j2 b/...ft_four_asic_vs/3/buffers_defaults_def.j2 → ...ft_four_asic_vs/3/buffers_defaults_def.j2
diff --git a/...sft_four_asic_vs/3/buffers_defaults_t0.j2 → ...sft_four_asic_vs/3/buffers_defaults_t0.j2 b/...sft_four_asic_vs/3/buffers_defaults_t0.j2 → ...sft_four_asic_vs/3/buffers_defaults_t0.j2
diff --git a/...sft_four_asic_vs/3/buffers_defaults_t1.j2 → ...sft_four_asic_vs/3/buffers_defaults_t1.j2 b/...sft_four_asic_vs/3/buffers_defaults_t1.j2 → ...sft_four_asic_vs/3/buffers_defaults_t1.j2
diff --git a/...x86_64-r0/msft_four_asic_vs/3/lanemap.ini → ...4_asic-r0/msft_four_asic_vs/3/lanemap.ini b/...x86_64-r0/msft_four_asic_vs/3/lanemap.ini → ...4_asic-r0/msft_four_asic_vs/3/lanemap.ini
diff --git a/...msft_four_asic_vs/3/pg_profile_lookup.ini → ...msft_four_asic_vs/3/pg_profile_lookup.ini b/...msft_four_asic_vs/3/pg_profile_lookup.ini → ...msft_four_asic_vs/3/pg_profile_lookup.ini
diff --git a/...64-r0/msft_four_asic_vs/3/port_config.ini → ...ic-r0/msft_four_asic_vs/3/port_config.ini b/...64-r0/msft_four_asic_vs/3/port_config.ini → ...ic-r0/msft_four_asic_vs/3/port_config.ini
diff --git a/...x86_64-r0/msft_four_asic_vs/3/qos.json.j2 → ...4_asic-r0/msft_four_asic_vs/3/qos.json.j2 b/...x86_64-r0/msft_four_asic_vs/3/qos.json.j2 → ...4_asic-r0/msft_four_asic_vs/3/qos.json.j2
diff --git a/...x86_64-r0/msft_four_asic_vs/3/sai.profile → ...4_asic-r0/msft_four_asic_vs/3/sai.profile b/...x86_64-r0/msft_four_asic_vs/3/sai.profile → ...4_asic-r0/msft_four_asic_vs/3/sai.profile
diff --git a/...our_asic_vs/3/td2-s6000-32x40G.config.bcm → ...our_asic_vs/3/td2-s6000-32x40G.config.bcm b/...our_asic_vs/3/td2-s6000-32x40G.config.bcm → ...our_asic_vs/3/td2-s6000-32x40G.config.bcm
diff --git a/...m_x86_64-r0/msft_four_asic_vs/topology.sh → ...4_4_asic-r0/msft_four_asic_vs/topology.sh b/...m_x86_64-r0/msft_four_asic_vs/topology.sh → ...4_4_asic-r0/msft_four_asic_vs/topology.sh
diff --git a/device/virtual/x86_64-mkvm_x86_64_4_asic-r0/plugins b/device/virtual/x86_64-mkvm_x86_64_4_asic-r0/plugins
@@ -0,0 +1 @@
+x86_64-kvm_x86_64-r0/plugins/
diff --git a/device/virtual/x86_64-mkvm_x86_64_4_asic-r0/pmon_daemon_control.json b/device/virtual/x86_64-mkvm_x86_64_4_asic-r0/pmon_daemon_control.json
@@ -0,0 +1 @@
+x86_64-kvm_x86_64-r0/pmon_daemon_control.json
diff --git a/device/virtual/x86_64-mkvm_x86_64_6_asic-r0/asic.conf b/device/virtual/x86_64-mkvm_x86_64_6_asic-r0/asic.conf
@@ -0,0 +1 @@
+NUM_ASIC=6
diff --git a/device/virtual/x86_64-mkvm_x86_64_6_asic-r0/default_sku b/device/virtual/x86_64-mkvm_x86_64_6_asic-r0/default_sku
@@ -0,0 +1 @@
+msft_multi_asic_vs
diff --git a/device/virtual/x86_64-mkvm_x86_64_6_asic-r0/installer.conf b/device/virtual/x86_64-mkvm_x86_64_6_asic-r0/installer.conf
@@ -0,0 +1 @@
+x86_64-kvm_x86_64-r0/installer.conf
diff --git a/...4-r0/msft_multi_asic_vs/0/buffers.json.j2 → ...c-r0/msft_multi_asic_vs/0/buffers.json.j2 b/...4-r0/msft_multi_asic_vs/0/buffers.json.j2 → ...c-r0/msft_multi_asic_vs/0/buffers.json.j2
diff --git a/...t_multi_asic_vs/0/buffers_defaults_def.j2 → ...t_multi_asic_vs/0/buffers_defaults_def.j2 b/...t_multi_asic_vs/0/buffers_defaults_def.j2 → ...t_multi_asic_vs/0/buffers_defaults_def.j2
diff --git a/...ft_multi_asic_vs/0/buffers_defaults_t0.j2 → ...ft_multi_asic_vs/0/buffers_defaults_t0.j2 b/...ft_multi_asic_vs/0/buffers_defaults_t0.j2 → ...ft_multi_asic_vs/0/buffers_defaults_t0.j2
diff --git a/...ft_multi_asic_vs/0/buffers_defaults_t1.j2 → ...ft_multi_asic_vs/0/buffers_defaults_t1.j2 b/...ft_multi_asic_vs/0/buffers_defaults_t1.j2 → ...ft_multi_asic_vs/0/buffers_defaults_t1.j2
diff --git a/...86_64-r0/msft_multi_asic_vs/0/lanemap.ini → ..._asic-r0/msft_multi_asic_vs/0/lanemap.ini b/...86_64-r0/msft_multi_asic_vs/0/lanemap.ini → ..._asic-r0/msft_multi_asic_vs/0/lanemap.ini
diff --git a/...sft_multi_asic_vs/0/pg_profile_lookup.ini → ...sft_multi_asic_vs/0/pg_profile_lookup.ini b/...sft_multi_asic_vs/0/pg_profile_lookup.ini → ...sft_multi_asic_vs/0/pg_profile_lookup.ini
diff --git a/...4-r0/msft_multi_asic_vs/0/port_config.ini → ...c-r0/msft_multi_asic_vs/0/port_config.ini b/...4-r0/msft_multi_asic_vs/0/port_config.ini → ...c-r0/msft_multi_asic_vs/0/port_config.ini
diff --git a/...86_64-r0/msft_multi_asic_vs/0/qos.json.j2 → ..._asic-r0/msft_multi_asic_vs/0/qos.json.j2 b/...86_64-r0/msft_multi_asic_vs/0/qos.json.j2 → ..._asic-r0/msft_multi_asic_vs/0/qos.json.j2
diff --git a/...86_64-r0/msft_multi_asic_vs/0/sai.profile → ..._asic-r0/msft_multi_asic_vs/0/sai.profile b/...86_64-r0/msft_multi_asic_vs/0/sai.profile → ..._asic-r0/msft_multi_asic_vs/0/sai.profile
diff --git a/...lti_asic_vs/0/td2-s6000-32x40G.config.bcm → ...lti_asic_vs/0/td2-s6000-32x40G.config.bcm b/...lti_asic_vs/0/td2-s6000-32x40G.config.bcm → ...lti_asic_vs/0/td2-s6000-32x40G.config.bcm
diff --git a/...4-r0/msft_multi_asic_vs/1/buffers.json.j2 → ...c-r0/msft_multi_asic_vs/1/buffers.json.j2 b/...4-r0/msft_multi_asic_vs/1/buffers.json.j2 → ...c-r0/msft_multi_asic_vs/1/buffers.json.j2
diff --git a/...t_multi_asic_vs/1/buffers_defaults_def.j2 → ...t_multi_asic_vs/1/buffers_defaults_def.j2 b/...t_multi_asic_vs/1/buffers_defaults_def.j2 → ...t_multi_asic_vs/1/buffers_defaults_def.j2
diff --git a/...ft_multi_asic_vs/1/buffers_defaults_t0.j2 → ...ft_multi_asic_vs/1/buffers_defaults_t0.j2 b/...ft_multi_asic_vs/1/buffers_defaults_t0.j2 → ...ft_multi_asic_vs/1/buffers_defaults_t0.j2
diff --git a/...ft_multi_asic_vs/1/buffers_defaults_t1.j2 → ...ft_multi_asic_vs/1/buffers_defaults_t1.j2 b/...ft_multi_asic_vs/1/buffers_defaults_t1.j2 → ...ft_multi_asic_vs/1/buffers_defaults_t1.j2
diff --git a/...86_64-r0/msft_multi_asic_vs/1/lanemap.ini → ..._asic-r0/msft_multi_asic_vs/1/lanemap.ini b/...86_64-r0/msft_multi_asic_vs/1/lanemap.ini → ..._asic-r0/msft_multi_asic_vs/1/lanemap.ini
diff --git a/...sft_multi_asic_vs/1/pg_profile_lookup.ini → ...sft_multi_asic_vs/1/pg_profile_lookup.ini b/...sft_multi_asic_vs/1/pg_profile_lookup.ini → ...sft_multi_asic_vs/1/pg_profile_lookup.ini
diff --git a/...4-r0/msft_multi_asic_vs/1/port_config.ini → ...c-r0/msft_multi_asic_vs/1/port_config.ini b/...4-r0/msft_multi_asic_vs/1/port_config.ini → ...c-r0/msft_multi_asic_vs/1/port_config.ini
diff --git a/...86_64-r0/msft_multi_asic_vs/1/qos.json.j2 → ..._asic-r0/msft_multi_asic_vs/1/qos.json.j2 b/...86_64-r0/msft_multi_asic_vs/1/qos.json.j2 → ..._asic-r0/msft_multi_asic_vs/1/qos.json.j2
diff --git a/...86_64-r0/msft_multi_asic_vs/1/sai.profile → ..._asic-r0/msft_multi_asic_vs/1/sai.profile b/...86_64-r0/msft_multi_asic_vs/1/sai.profile → ..._asic-r0/msft_multi_asic_vs/1/sai.profile
diff --git a/...lti_asic_vs/1/td2-s6000-32x40G.config.bcm → ...lti_asic_vs/1/td2-s6000-32x40G.config.bcm b/...lti_asic_vs/1/td2-s6000-32x40G.config.bcm → ...lti_asic_vs/1/td2-s6000-32x40G.config.bcm
diff --git a/...4-r0/msft_multi_asic_vs/2/buffers.json.j2 → ...c-r0/msft_multi_asic_vs/2/buffers.json.j2 b/...4-r0/msft_multi_asic_vs/2/buffers.json.j2 → ...c-r0/msft_multi_asic_vs/2/buffers.json.j2
diff --git a/...t_multi_asic_vs/2/buffers_defaults_def.j2 → ...t_multi_asic_vs/2/buffers_defaults_def.j2 b/...t_multi_asic_vs/2/buffers_defaults_def.j2 → ...t_multi_asic_vs/2/buffers_defaults_def.j2
diff --git a/...ft_multi_asic_vs/2/buffers_defaults_t0.j2 → ...ft_multi_asic_vs/2/buffers_defaults_t0.j2 b/...ft_multi_asic_vs/2/buffers_defaults_t0.j2 → ...ft_multi_asic_vs/2/buffers_defaults_t0.j2
diff --git a/...ft_multi_asic_vs/2/buffers_defaults_t1.j2 → ...ft_multi_asic_vs/2/buffers_defaults_t1.j2 b/...ft_multi_asic_vs/2/buffers_defaults_t1.j2 → ...ft_multi_asic_vs/2/buffers_defaults_t1.j2
diff --git a/...86_64-r0/msft_multi_asic_vs/2/lanemap.ini → ..._asic-r0/msft_multi_asic_vs/2/lanemap.ini b/...86_64-r0/msft_multi_asic_vs/2/lanemap.ini → ..._asic-r0/msft_multi_asic_vs/2/lanemap.ini
diff --git a/...sft_multi_asic_vs/2/pg_profile_lookup.ini → ...sft_multi_asic_vs/2/pg_profile_lookup.ini b/...sft_multi_asic_vs/2/pg_profile_lookup.ini → ...sft_multi_asic_vs/2/pg_profile_lookup.ini
diff --git a/...4-r0/msft_multi_asic_vs/2/port_config.ini → ...c-r0/msft_multi_asic_vs/2/port_config.ini b/...4-r0/msft_multi_asic_vs/2/port_config.ini → ...c-r0/msft_multi_asic_vs/2/port_config.ini
diff --git a/...86_64-r0/msft_multi_asic_vs/2/qos.json.j2 → ..._asic-r0/msft_multi_asic_vs/2/qos.json.j2 b/...86_64-r0/msft_multi_asic_vs/2/qos.json.j2 → ..._asic-r0/msft_multi_asic_vs/2/qos.json.j2
diff --git a/...86_64-r0/msft_multi_asic_vs/2/sai.profile → ..._asic-r0/msft_multi_asic_vs/2/sai.profile b/...86_64-r0/msft_multi_asic_vs/2/sai.profile → ..._asic-r0/msft_multi_asic_vs/2/sai.profile
diff --git a/...lti_asic_vs/2/td2-s6000-32x40G.config.bcm → ...lti_asic_vs/2/td2-s6000-32x40G.config.bcm b/...lti_asic_vs/2/td2-s6000-32x40G.config.bcm → ...lti_asic_vs/2/td2-s6000-32x40G.config.bcm
diff --git a/...4-r0/msft_multi_asic_vs/3/buffers.json.j2 → ...c-r0/msft_multi_asic_vs/3/buffers.json.j2 b/...4-r0/msft_multi_asic_vs/3/buffers.json.j2 → ...c-r0/msft_multi_asic_vs/3/buffers.json.j2
diff --git a/...t_multi_asic_vs/3/buffers_defaults_def.j2 → ...t_multi_asic_vs/3/buffers_defaults_def.j2 b/...t_multi_asic_vs/3/buffers_defaults_def.j2 → ...t_multi_asic_vs/3/buffers_defaults_def.j2
diff --git a/...ft_multi_asic_vs/3/buffers_defaults_t0.j2 → ...ft_multi_asic_vs/3/buffers_defaults_t0.j2 b/...ft_multi_asic_vs/3/buffers_defaults_t0.j2 → ...ft_multi_asic_vs/3/buffers_defaults_t0.j2
diff --git a/...ft_multi_asic_vs/3/buffers_defaults_t1.j2 → ...ft_multi_asic_vs/3/buffers_defaults_t1.j2 b/...ft_multi_asic_vs/3/buffers_defaults_t1.j2 → ...ft_multi_asic_vs/3/buffers_defaults_t1.j2
diff --git a/...86_64-r0/msft_multi_asic_vs/3/lanemap.ini → ..._asic-r0/msft_multi_asic_vs/3/lanemap.ini b/...86_64-r0/msft_multi_asic_vs/3/lanemap.ini → ..._asic-r0/msft_multi_asic_vs/3/lanemap.ini
diff --git a/...sft_multi_asic_vs/3/pg_profile_lookup.ini → ...sft_multi_asic_vs/3/pg_profile_lookup.ini b/...sft_multi_asic_vs/3/pg_profile_lookup.ini → ...sft_multi_asic_vs/3/pg_profile_lookup.ini
diff --git a/...4-r0/msft_multi_asic_vs/3/port_config.ini → ...c-r0/msft_multi_asic_vs/3/port_config.ini b/...4-r0/msft_multi_asic_vs/3/port_config.ini → ...c-r0/msft_multi_asic_vs/3/port_config.ini
diff --git a/...86_64-r0/msft_multi_asic_vs/3/qos.json.j2 → ..._asic-r0/msft_multi_asic_vs/3/qos.json.j2 b/...86_64-r0/msft_multi_asic_vs/3/qos.json.j2 → ..._asic-r0/msft_multi_asic_vs/3/qos.json.j2
diff --git a/...86_64-r0/msft_multi_asic_vs/3/sai.profile → ..._asic-r0/msft_multi_asic_vs/3/sai.profile b/...86_64-r0/msft_multi_asic_vs/3/sai.profile → ..._asic-r0/msft_multi_asic_vs/3/sai.profile
diff --git a/...lti_asic_vs/3/td2-s6000-32x40G.config.bcm → ...lti_asic_vs/3/td2-s6000-32x40G.config.bcm b/...lti_asic_vs/3/td2-s6000-32x40G.config.bcm → ...lti_asic_vs/3/td2-s6000-32x40G.config.bcm
diff --git a/...4-r0/msft_multi_asic_vs/4/buffers.json.j2 → ...c-r0/msft_multi_asic_vs/4/buffers.json.j2 b/...4-r0/msft_multi_asic_vs/4/buffers.json.j2 → ...c-r0/msft_multi_asic_vs/4/buffers.json.j2
diff --git a/...t_multi_asic_vs/4/buffers_defaults_def.j2 → ...t_multi_asic_vs/4/buffers_defaults_def.j2 b/...t_multi_asic_vs/4/buffers_defaults_def.j2 → ...t_multi_asic_vs/4/buffers_defaults_def.j2
diff --git a/...ft_multi_asic_vs/4/buffers_defaults_t0.j2 → ...ft_multi_asic_vs/4/buffers_defaults_t0.j2 b/...ft_multi_asic_vs/4/buffers_defaults_t0.j2 → ...ft_multi_asic_vs/4/buffers_defaults_t0.j2
diff --git a/...ft_multi_asic_vs/4/buffers_defaults_t1.j2 → ...ft_multi_asic_vs/4/buffers_defaults_t1.j2 b/...ft_multi_asic_vs/4/buffers_defaults_t1.j2 → ...ft_multi_asic_vs/4/buffers_defaults_t1.j2
diff --git a/...86_64-r0/msft_multi_asic_vs/4/lanemap.ini → ..._asic-r0/msft_multi_asic_vs/4/lanemap.ini b/...86_64-r0/msft_multi_asic_vs/4/lanemap.ini → ..._asic-r0/msft_multi_asic_vs/4/lanemap.ini
diff --git a/...sft_multi_asic_vs/4/pg_profile_lookup.ini → ...sft_multi_asic_vs/4/pg_profile_lookup.ini b/...sft_multi_asic_vs/4/pg_profile_lookup.ini → ...sft_multi_asic_vs/4/pg_profile_lookup.ini
diff --git a/...4-r0/msft_multi_asic_vs/4/port_config.ini → ...c-r0/msft_multi_asic_vs/4/port_config.ini b/...4-r0/msft_multi_asic_vs/4/port_config.ini → ...c-r0/msft_multi_asic_vs/4/port_config.ini
diff --git a/...86_64-r0/msft_multi_asic_vs/4/qos.json.j2 → ..._asic-r0/msft_multi_asic_vs/4/qos.json.j2 b/...86_64-r0/msft_multi_asic_vs/4/qos.json.j2 → ..._asic-r0/msft_multi_asic_vs/4/qos.json.j2
diff --git a/...86_64-r0/msft_multi_asic_vs/4/sai.profile → ..._asic-r0/msft_multi_asic_vs/4/sai.profile b/...86_64-r0/msft_multi_asic_vs/4/sai.profile → ..._asic-r0/msft_multi_asic_vs/4/sai.profile
diff --git a/...lti_asic_vs/4/td2-s6000-32x40G.config.bcm → ...lti_asic_vs/4/td2-s6000-32x40G.config.bcm b/...lti_asic_vs/4/td2-s6000-32x40G.config.bcm → ...lti_asic_vs/4/td2-s6000-32x40G.config.bcm
diff --git a/...4-r0/msft_multi_asic_vs/5/buffers.json.j2 → ...c-r0/msft_multi_asic_vs/5/buffers.json.j2 b/...4-r0/msft_multi_asic_vs/5/buffers.json.j2 → ...c-r0/msft_multi_asic_vs/5/buffers.json.j2
diff --git a/...t_multi_asic_vs/5/buffers_defaults_def.j2 → ...t_multi_asic_vs/5/buffers_defaults_def.j2 b/...t_multi_asic_vs/5/buffers_defaults_def.j2 → ...t_multi_asic_vs/5/buffers_defaults_def.j2
diff --git a/...ft_multi_asic_vs/5/buffers_defaults_t0.j2 → ...ft_multi_asic_vs/5/buffers_defaults_t0.j2 b/...ft_multi_asic_vs/5/buffers_defaults_t0.j2 → ...ft_multi_asic_vs/5/buffers_defaults_t0.j2
diff --git a/...ft_multi_asic_vs/5/buffers_defaults_t1.j2 → ...ft_multi_asic_vs/5/buffers_defaults_t1.j2 b/...ft_multi_asic_vs/5/buffers_defaults_t1.j2 → ...ft_multi_asic_vs/5/buffers_defaults_t1.j2
diff --git a/...86_64-r0/msft_multi_asic_vs/5/lanemap.ini → ..._asic-r0/msft_multi_asic_vs/5/lanemap.ini b/...86_64-r0/msft_multi_asic_vs/5/lanemap.ini → ..._asic-r0/msft_multi_asic_vs/5/lanemap.ini
diff --git a/...sft_multi_asic_vs/5/pg_profile_lookup.ini → ...sft_multi_asic_vs/5/pg_profile_lookup.ini b/...sft_multi_asic_vs/5/pg_profile_lookup.ini → ...sft_multi_asic_vs/5/pg_profile_lookup.ini
diff --git a/...4-r0/msft_multi_asic_vs/5/port_config.ini → ...c-r0/msft_multi_asic_vs/5/port_config.ini b/...4-r0/msft_multi_asic_vs/5/port_config.ini → ...c-r0/msft_multi_asic_vs/5/port_config.ini
diff --git a/...86_64-r0/msft_multi_asic_vs/5/qos.json.j2 → ..._asic-r0/msft_multi_asic_vs/5/qos.json.j2 b/...86_64-r0/msft_multi_asic_vs/5/qos.json.j2 → ..._asic-r0/msft_multi_asic_vs/5/qos.json.j2
diff --git a/...86_64-r0/msft_multi_asic_vs/5/sai.profile → ..._asic-r0/msft_multi_asic_vs/5/sai.profile b/...86_64-r0/msft_multi_asic_vs/5/sai.profile → ..._asic-r0/msft_multi_asic_vs/5/sai.profile
diff --git a/...lti_asic_vs/5/td2-s6000-32x40G.config.bcm → ...lti_asic_vs/5/td2-s6000-32x40G.config.bcm b/...lti_asic_vs/5/td2-s6000-32x40G.config.bcm → ...lti_asic_vs/5/td2-s6000-32x40G.config.bcm
diff --git a/..._x86_64-r0/msft_multi_asic_vs/topology.sh → ..._6_asic-r0/msft_multi_asic_vs/topology.sh b/..._x86_64-r0/msft_multi_asic_vs/topology.sh → ..._6_asic-r0/msft_multi_asic_vs/topology.sh
diff --git a/device/virtual/x86_64-mkvm_x86_64_6_asic-r0/plugins b/device/virtual/x86_64-mkvm_x86_64_6_asic-r0/plugins
@@ -0,0 +1 @@
+x86_64-kvm_x86_64-r0/plugins/
@@ -1,4 +1,7 @@
 ONIE_RECOVERY_IMAGE = onie-recovery-x86_64-kvm_x86_64-r0.iso
 $(ONIE_RECOVERY_IMAGE)_URL = "https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64-r0.iso?sv=2015-04-05&sr=b&sig=XMAk1cttBFM369CMbihe5oZgXwe4uaDVfwg4CTLT%2F5U%3D&se=2155-10-13T10%3A40%3A13Z&sp=r"
-
-SONIC_ONLINE_FILES += $(ONIE_RECOVERY_IMAGE)
+ONIE_RECOVERY_MKVM_4ASIC_IMAGE = onie-recovery-x86_64-mkvm_x86_64_4_asic-r0.iso
+$(ONIE_RECOVERY_MKVM_4ASIC_IMAGE)_URL=""
+ONIE_RECOVERY_MKVM_6ASIC_IMAGE = onie-recovery-x86_64-mkvm_x86_64_6_asic-r0.iso
+$(ONIE_RECOVERY_MKVM_6ASIC_IMAGE)_URL=""
+SONIC_ONLINE_FILES += $(ONIE_RECOVERY_IMAGE) $(ONIE_RECOVERY_MKVM_4ASIC_IMAGE) $(ONIE_RECOVERY_MKVM_6ASIC_IMAGE)