Merge branch 'main' into robadams-cicd

beta/Dockerfile

@@ -14,20 +14,20 @@ LABEL org.opencontainers.image.source = "https://github.com/ITI/pcesapps"
 RUN ldd --version
 WORKDIR /build
 COPY . .
-RUN cd bld-dir && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ./bld.go
-RUN cd bld-dir && ./bld -is args-bld
-RUN cd db && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build cnvrtExec.go
-RUN cd db && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build cnvrtDesc.go
-RUN cd sim-dir && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ./sim.go
+# RUN cd bld-dir && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ./bld.go
+# RUN cd bld-dir && ./bld -is args-bld
+# RUN cd db && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build cnvrtExec.go
+# RUN cd db && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build cnvrtDesc.go
+# RUN cd sim-dir && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ./sim.go
 
 # Production phase
 FROM debian:bookworm
-RUN apt update && apt upgrade -y && apt install -y \
-	python3 \
-	python3-tk \
-	python3-pil \
-	python3-pil.imagetk vim-nox \
-	python3-yaml \
-	python3-matplotlib
+#RUN apt update && apt upgrade -y && apt install -y \
+#	python3 \
+#	python3-tk \
+#	python3-pil \
+#	python3-pil.imagetk vim-nox \
+#	python3-yaml \
+#	python3-matplotlib
 WORKDIR /app
 COPY --from=builder /build/. .

beta/bld-dir/args-bld

@@ -5,7 +5,7 @@
 -funcExec funcExec.yaml
 -devExec devExec.yaml
 -devDesc devDesc.yaml
--srdState srdState.yaml
+-srdCfg srdCfg.yaml
 -map map.yaml
 -exp exp.yaml
 -topo topo.yaml
@@ -17,23 +17,21 @@
 -srcCPU Intel-i7-1185G7E
 -srcCPUBw 10
 -pvtNetBw 10
--pubNetBw 1000
+-pubNetBw 10
 -pvtSwitch ACME-Generic-Slow-Switch
 -pubSwitch ACME-Generic-Fast-Switch
 -pvtSwitchBw 10
--pubSwitchBw 1000
+-pubSwitchBw 10
 -pvtRtr ACME-Generic-Slow-Router
 -pubRtr ACME-Generic-Slow-Router
--pvtRtrBw 1000
--pubRtrBw 1000
--sslCPU Intel-Xeon-w-1350P
--sslCPUBw 1000
+-pvtRtrBw 10
+-pubRtrBw 10
 -pcktlen 128
 -pcktburst 10
--pcktMu 0
+-pcktMu 0.001
 -euds 100
 -eudCPU Intel-i3-4130
 -eudCPUBw 10
--cryptoalg 3des
+-cryptoalg des
 -keylength 256
--sslsrvr True
+-sslsrvr False

beta/bld-dir/args-bld-base

@@ -5,7 +5,7 @@
 -funcExec funcExec.yaml
 -devExec devExec.yaml
 -devDesc devDesc.yaml
--srdState srdState.yaml
+-srdCfg srdCfg.yaml
 -map map.yaml
 -exp exp.yaml
 -topo topo.yaml