Skip to content

Commit

Permalink
Revert "DPB Breakout Cli Test with proper setup (#3910)"
Browse files Browse the repository at this point in the history
This reverts commit 0a409ff.
  • Loading branch information
lguohan committed Aug 5, 2020
1 parent 082c26a commit 457674c
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 721 deletions.
7 changes: 1 addition & 6 deletions platform/vs/docker-sonic-vs/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
100 changes: 0 additions & 100 deletions platform/vs/docker-sonic-vs/hwsku.json

This file was deleted.

196 changes: 0 additions & 196 deletions platform/vs/docker-sonic-vs/platform.json

This file was deleted.

2 changes: 1 addition & 1 deletion platform/vs/docker-sonic-vs/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading

0 comments on commit 457674c

Please sign in to comment.