diff --git a/.jenkins.sh b/.jenkins.sh index 56c131a15833c0498de398eeabff058729fdeee4..3193dce78a4f8e22765fb624a5f507078b631f1d 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -7,12 +7,12 @@ YANG_MODULES="yang/yang/*" OUTPUT="etsi-nfv.html" -IMG_NAME="nfv-sol6" -VERSION=1.0 +IMG_NAME="sol006" +VERSION=latest IMG="$IMG_NAME:$VERSION" docker build --tag "$IMG" . -docker run "$IMG" "/bin/sh" -c "pyang -f jstree $YANG_MODULES" > "$OUTPUT" +docker run "$IMG" -exit $([ -f "$OUTPUT" ]) +exit $? diff --git a/Dockerfile b/Dockerfile index 7cc8b80ddfce0c879fca81a5cc4a9cdbf4b9f2ff..8aab1ebd7be8871557752fef0629e05757ac03e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,7 @@ -FROM forge-pyang +FROM mjethanandani/sol-006:latest -ADD src /yang +ADD example-data/* src/ +ADD src/yang/* src/ +ADD run-test.sh / + +CMD ["/run-test.sh"] diff --git a/example-data/nfv.xml b/example-data/nfv.xml new file mode 100644 index 0000000000000000000000000000000000000000..4f7e7fc91e67375597a85a8fb53aedc0e0054c22 --- /dev/null +++ b/example-data/nfv.xml @@ -0,0 +1,520 @@ + + + + ASA + Cisco + Cisco ASAv + 9.8 + 9.8 + ESC + + firewall + Firewall VDU + + inside + inside + common:Ethernet + + + management + management + common:Ethernet + + + outside + outside + common:Ethernet + + asa-vcd + asa-vsd + asa-image + + + asa-vcd + + 4.0 + + + 2 + + + + asa-vsd + root + 0 + + + asa-image + bare + qcow2 + 2.0 + http://www.cisco.com/asa.qcow2 + + + inside + common:Ethernet + + + management + common:Ethernet + + + outside + common:Ethernet + + + normal + + firewall + 1 + 2 + + + double + + firewall + 2 + + + + single + + firewall + 1 + + + single + + + + CSR + Cisco + Cisco CSR 1000v + 3.16 + 3.16 + ESC + + router + Router VDU + + left + left + common:Ethernet + + + management + management + common:Ethernet + + + right + right + common:Ethernet + + csr-vcd + csr-vsd + csr-image + + + csr-vcd + + 4.0 + + + 2 + + + + csr-vsd + root + 0 + + + csr-image + bare + qcow2 + 2.0 + http://www.cisco.com/csr.qcow2 + + + left + common:Ethernet + + + management + common:Ethernet + + + right + common:Ethernet + + + normal + + router + 1 + 2 + + + double + + router + 2 + + + + single + + router + 1 + + + single + + + + firewall-nsd + ASA + + inside + + + management + + + outside + + + firewall + + firewall + ASA + normal + single + 1 + 1 + + + single + + firewall + 1 + + + + + + service-chain-1 + ASA + CSR + physical-dpi + + inside + + + management + mgmt + + + outside + + CSR + left + + + + fw2dpi + 1.0 + + common:Ethernet + + + normal + + 0 + 0 + + + + + mgmt + 1.0 + + common:IPv4 + + + normal + + 0 + 0 + + + + + r2fw + 1.0 + + common:Ethernet + + + normal + + 0 + 0 + + + + + router-fw + + firewall + ASA + normal + single + 1 + 1 + + mgmt + management + + + r2fw + outside + + + + router + CSR + normal + single + 1 + 1 + + mgmt + management + + + r2fw + right + + + + mgmt + mgmt + normal + + 1000 + + + 0 + + + + r2fw + r2fw + normal + + 10000000 + + + 0 + + + + normal + Single FW and Router + + firewall + 1 + + + router + 1 + + + + + router-fw-dpi + + firewall + ASA + normal + single + 1 + 1 + + fw2dpi + inside + + + mgmt + management + + + r2fw + outside + + + + router + CSR + normal + single + 1 + 1 + + mgmt + management + + + r2fw + right + + + + physical-dpi + physical-dpi + + fw2dpi + outside + + + + fw2dpi + fw2dpi + normal + + 1000000 + + + 0 + + + + mgmt + mgmt + normal + + 1000 + + + 0 + + + + r2fw + r2fw + normal + + 1000000 + + + 0 + + + + normal + Router+FW+Physical DPI + + firewall + 1 + + + router + 1 + + + + + + service-chain-2 + firewall-nsd + CSR + + inside + + firewall-nsd + inside + + + + outside + + CSR + left + + + + r2fw + 1.0 + + common:IPv4 + + + r2fw + + 1000 + 2 + + + + + router-fw + + router + CSR + normal + single + 1 + 1 + + r2fw + right + + + + r2fw + r2fw + r2fw + + 500 + + + 0 + + + + normal + + router + 1 + + + r2fw + 10 + + + + firewall + firewall-nsd + firewall + single + 1 + 1 + + r2fw + outside + + + + + + physical-dpi + 1.0 + + outside + common:Ethernet + + + + diff --git a/run-test.sh b/run-test.sh new file mode 100755 index 0000000000000000000000000000000000000000..8b27e5aa5a90be87efc13d63a63a584c6f5f32fe --- /dev/null +++ b/run-test.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +echo "Testing" + +set -e + +source /opt/confd/confdrc +cd src + +echo "Testing compilation" +CONFD_OPTS="--fail-on-warnings" +CONFD_OPTS="" +confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv-common.fxs etsi-nfv-common.yang +confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv.fxs etsi-nfv.yang + +echo "Starting ConfD" +confd + +echo "Loading Data" +confd_load -l -m nfv.xml + +# Don't do this in the actual test, just waste of cycles +# echo "Stopping ConfD" +# confd --stop