Revert "DPB Breakout Cli Test with proper setup (sonic-net#3910)"

This reverts commit 0a409ff.

Author: lguohan

platform/vs/docker-sonic-vs/Dockerfile.j2

@@ -46,8 +46,7 @@ RUN apt-get install -y net-tools \
                        python-scapy \
                        conntrack \
                        iptables \
-                       python3-pip \
-                       jq
+                       python3-pip
 
 RUN pip install setuptools
 RUN pip3 install setuptools
@@ -133,10 +132,6 @@ COPY ["hostname.j2", "/usr/share/sonic/templates/"]
 COPY ["default_chassis_cfg.json", "/etc/default/sonic-db/"]
 COPY ["chassis_db.py", "/usr/bin/"]
 
-COPY ["platform.json", "/usr/share/sonic/device/x86_64-kvm_x86_64-r0/"]
-COPY ["hwsku.json", "/usr/share/sonic/device/x86_64-kvm_x86_64-r0/Force10-S6000/"]
-COPY ["platform.json", "/usr/share/sonic/platform/"]
-
 # Workaround the tcpdump issue
 RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump
 

platform/vs/docker-sonic-vs/hwsku.json

@@ -40,7 +40,7 @@ else
     # generate and merge buffers configuration into config file
     sonic-cfggen -k $HWSKU -p /usr/share/sonic/hwsku/port_config.ini -t /usr/share/sonic/hwsku/buffers.json.j2 > /tmp/buffers.json
     sonic-cfggen -j /etc/sonic/init_cfg.json -t /usr/share/sonic/hwsku/qos.json.j2 > /tmp/qos.json
-    sonic-cfggen -p /usr/share/sonic/device/$PLATFORM/platform.json -k $HWSKU --print-data > /tmp/ports.json
+    sonic-cfggen -p /usr/share/sonic/hwsku/port_config.ini -k $HWSKU --print-data > /tmp/ports.json
     sonic-cfggen -j /etc/sonic/init_cfg.json -j /tmp/buffers.json -j /tmp/qos.json -j /tmp/ports.json --print-data > /etc/sonic/config_db.json
 fi