automatic commit at releng box

mc36 · Mar 14, 2022 · 3fe6455 · 3fe6455
1 parent 4075ae2
commit 3fe6455
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/net/freertr/serv/servP4lang.java b/src/net/freertr/serv/servP4lang.java
@@ -437,9 +437,14 @@ public boolean srvCfgStr(cmds cmd) {
                     return false;
                 }
                 sendLine("state " + ntry.id + " 0 " + orig.getStateEnding());
-                sendLine("state " + ntry.id + " 1 " + ntry.getStateEnding());
+                sendLine("ports_mod " + ntry.id + " " + ntry.getStateEnding());
+                ntry.sentState = state.states.admin;
+                ntry.sentMtu = 0;
                 return false;
             }
+            if (!ntry.suppressState()) {
+                sendLine("ports_add " + ntry.id + " " + ntry.getStateEnding());
+            }
             if (ntry.dynamic) {
                 int id = getNextDynamic();
                 if (id < 0) {
@@ -1766,6 +1771,7 @@ public void tearDown() {
         }
         if (!suppressState()) {
             lower.sendLine("state " + id + " 0 " + getStateEnding());
+            lower.sendLine("ports_del " + id + getStateEnding());
         }
         if ((ifc.type == cfgIfc.ifaceType.sdn) && (ifc.vlanNum == 0)) {
             ifcNull nul = new ifcNull();
@@ -2240,6 +2246,9 @@ private boolean doNegot() {
         int dynRngNxt = lower.dynRngBeg;
         for (int i = 0; i < lower.expIfc.size(); i++) {
             servP4langIfc ntry = lower.expIfc.get(i);
+            if (!ntry.suppressState()) {
+                lower.sendLine("ports_add " + ntry.id + " " + ntry.getStateEnding());
+            }
             if (!ntry.dynamic) {
                 continue;
             }

diff --git a/src/rtr.csv b/src/rtr.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v22.3.14-cur, done by cs@nop.
--;-;-;2022-03-14 15:59:32, took 00:08:00, with 100 workers, on 2780 cases, 0 failed, 0 traces, 5 retries
+-;-;-;2022-03-14 16:08:07, took 00:07:25, with 100 workers, on 2780 cases, 0 failed, 0 traces, 5 retries
 -;-;-;./rtr.bin
 http://sources.freertr.net/cfg/basic.tst;basic.tst;success;dummy test
 http://sources.freertr.net/cfg/conn-amt01.tst;conn-amt01.tst;success;amt over ipv4

diff --git a/src/rtr.html b/src/rtr.html
@@ -11,7 +11,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v22.3.14-cur, done by cs@nop.<br/>
-tested: 2022-03-14 15:59:32, took 00:08:00, with 100 workers, on 2780 cases, 0 failed, 0 traces, 5 retries<br/>
+tested: 2022-03-14 16:08:07, took 00:07:25, with 100 workers, on 2780 cases, 0 failed, 0 traces, 5 retries<br/>
 jvm: ./rtr.bin<br/>
 <br/>
 <table><thead><tr><td><b>file</b></td><td><b>result</b></td><td><b>test</b></td></tr></thead><tbody>