Added new milestones for L2O project, a detail page for finished milestone 7 and corrected the description of the configuration syntax for test ng test cases.

3 files changed, 118 insertions, 8 deletions

diff --git a/template/l2o/index.html.j2 b/template/l2o/index.html.j2
index 17644fde..e859f70f 100644
--- a/template/l2o/index.html.j2
+++ b/template/l2o/index.html.j2
@@ -19,6 +19,9 @@
       <a class="nav-link" href="#milestone4">{{ _("Milestone 4") }}</a>
       <a class="nav-link" href="#milestone5">{{ _("Milestone 5") }}</a>
       <a class="nav-link" href="#milestone6">{{ _("Milestone 6") }}</a>
+      <a class="nav-link" href="#milestone7">{{ _("Milestone 7") }}</a>
+      <a class="nav-link" href="#milestone8">{{ _("Milestone 8") }}</a>
+      <a class="nav-link" href="#milestone9">{{ _("Milestone 9") }}</a>
       </nav>
     </div>
     <div class="col">
@@ -208,7 +211,59 @@ I will finish the project with a performance analysis to optimize the selection
         </p><br/>
       </section>
 
-      
+      <h3><a name="milestone7" class="subnav-anchor"></a>{{ _("Milestone 7 Removing deprecated code") }}</h3><br/>
+      <section>
+        <p>
+          {% trans %}
+             The code of the old transport API and of the ATS API will be removed from the code base. This is
+mainly the use of the API in the Core layer, and suggesting addresses to connect to other peers in
+all kinds of other GNUnet layers. Additionally all tests which rely on the removed code will be set
+inactive. All usages of the old APIs will be removed. If it is not much work to replace the old with the
+new API this will be done directly, otherwise there will be a TODO comment what needs to be doneto make that part of the code working again with the new code. Documentation of code that will be
+deleted without replacement, because the functionality is missing in the new API.  
+          {% endtrans %}
+        </p><br/>
+        <h4>Deliverable</h4><br/>
+        <p>
+          {% trans %}
+                Removed APIs from code base, deactivated dependent tests and either documentation of what is
+necessary for the integration of the new API, or if the effort for this is as high as the documentation
+directly the implementation. More  <a href="mile7.html">Details</a>.
+          {% endtrans %}
+        </p><br/>
+      </section>
+
+      <h3><a name="milestone8" class="subnav-anchor"></a>{{ _("Milestone 8 Make GNUnet start again") }}</h3><br/>
+      <section>
+        <p>
+          {% trans %}
+             All missing implementations of the new API will be finished, necessary to make GNUnet start and
+being usable for its basic functionality (DHT, GNS, CADET, FS, Messenger …). 
+          {% endtrans %}
+        </p><br/>
+        <h4>Deliverable</h4><br/>
+        <p>
+          {% trans %}
+                GNUnet running with new API.
+          {% endtrans %}
+        </p><br/>
+      </section>
+
+      <h3><a name="milestone9" class="subnav-anchor"></a>{{ _("Milestone 9 Testing and Fixing") }}</h3><br/>
+      <section>
+        <p>
+          {% trans %}
+             Because all integration tests are deactivated, and there are no resources to rewrite them at the
+time being, extensive manual testing and certainly bug fixing is necessary. 
+          {% endtrans %}
+        </p><br/>
+        <h4>Deliverable</h4><br/>
+        <p>
+          {% trans %}
+                GNUnet release running with new API.
+          {% endtrans %}
+        </p><br/>
+      </section>
 
     </div>
   </div>
diff --git a/template/l2o/mile7.html.j2 b/template/l2o/mile7.html.j2
new file mode 100644
index 00000000..4009f1f4
--- /dev/null
+++ b/template/l2o/mile7.html.j2
@@ -0,0 +1,52 @@
+ {% extends "common/base.j2" %}
+{% block body_content %}
+<main id="maincontent">
+<article class="container">
+
+  <header>
+    <h1>{{ _("NGI Assure project: Layer-2-Overlay") }}</h1>
+  </header>
+
+  <div class="row">
+    <div class="col-2 d-none d-lg-block"><!-- for large viewports show menu for better orientation -->
+      <nav class="nav subnav position-fixed flex-column border-right" style="position:fixed">
+      <a class="nav-link" href="index.html#idea">{{ _("Project main page") }}</a>
+      </nav>
+    </div>
+    <div class="col">
+
+      <h2>Implementation details milestone 7</h2><br/>
+
+      <section>
+        <h4>{{ _("Marked old transport API as deprecated") }}</h4><br/>
+        <p>
+          {% trans %}
+          To make the search for the old API methods easier, those methods were marked as deprecated in their header files.</br></br>
+          
+          See branch l20integration revision 664286d.
+          {% endtrans %}
+        </p>
+      </section>
+      <section>
+        <h4>{{ _("Removed usage of old transport API methods") }}</h4><br/>
+        <p>
+          {% trans %}
+          Removed usage of old transport API methods and exchanged them with API methods of L2O or deleted without replacement, if there is no corresponding functionality in L2O.</br></br>
+
+          In the process, the subsystems cadet, core, dhtu, fs and topology were touched.</br></br>
+
+          The blacklist and friend functionality in subsystem topology was deleted without replacement, as well as the bandwith allocation in the fs (file sharing) subsystem.</br></br>
+
+          In the transport subsystem itself, old API methods are still used until the code is finally removed in Milestone 9. There is a cli tool gnunet-transport in the transport subsystem which needs be rewritten partially to get infromation from L2O which can not retrieved via the old API anymore.</br></br>
+
+          Additionally there is a peerinfo cli tool gnunet-peerinfo, which needs to be rewritten partially too.</br></br>
+          
+          See branch l20integration revision b78f993.
+          {% endtrans %}
+        </p>
+      </section>
+    </div>
+  </div>
+
+</article>
+{% endblock body_content %}
diff --git a/template/l2o/testng.html.j2 b/template/l2o/testng.html.j2
index 4509b756..69905711 100644
--- a/template/l2o/testng.html.j2
+++ b/template/l2o/testng.html.j2
@@ -84,28 +84,31 @@ GlobalPluginName = "libgnunet_test_transport_plugin_cmd_", PluginName ;<br/><br/
 GlobalPeer = "K", ":", IndexOfGlobalNode ;<br/><br/>
 KValue = EstablishConnectionToPeerViaProtocol ;<br/><br/>
 IndexOfSubnetRouter = Zero | NaturalNumber ;<br/><br/>
-RValue = "{", ProtocolPortToOpen, ":", switch, "}" ;<br/><br/>
+RValue = OpenTCP, "|", OpenUDP ;<br/><br/>
 SubnetPeer = "P:", SubnetIndex, ":", NodeIndexInSubnet ;<br/><br/>
-PValue = EstablishConnectionToPeerViaProtocol, "|", { "{", NumberOfAdditionalConnections, "}" } ;<br/><br/>
+PValue = EstablishConnectionToPeerViaProtocol, { "|", "{", NumberOfAdditionalConnections, "}" } ;<br/><br/>
 Zero = "0" ;<br/><br/>
 NaturalNumber = NumeralWithoutZero, { Numeral } ;<br/><br/>
 PluginName = Letter , { ( Letter | "_" ) } ;<br/><br/>
 IndexOfGlobalNode = Zero | NaturalNumber ;<br/><br/>
 EstablishConnectionToPeerViaProtocol = "{" "connect", ":" EstablishConnectionToPeerViaProtocolValues "}" ;<br/><br/>
-ProtocolPortToOpen = "tcp_port" | "udp_port" ;<br/><br/>
-switch = On | Off ;<br/><br/>
+OpenTCP = OpenTCPNoSource | OpenTCPWithSource ;<br/><br/>
+OpenUDP = OpenUDPNoSource | OpenUDPWithSource ;<br/><br/>
 SubnetIndex = NaturalNumber ;<br/><br/>
 NodeIndexInSubnet = NaturalNumber ;<br/><br/>
 NumeralWithoutZero = "0" | Numeral ;<br/><br/>
 Numeral = "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;<br/><br/>
 Letter = "A" | "B" | ... | "Z" | "a" | ... | "z";<br/><br/>
 EstablishConnectionToPeerViaProtocolValues = EstablishConnectionToPeerViaProtocolValue { "|", EstablishConnectionToPeerViaProtocolValue }
+OpenTCPNoSource = "{tcp_port:", switch, "}" ;<br/><br/>
+OpenUDPNoSource = "{udp_port:", switch, "}" ;<br/><br/>
+OpenTCPWithSource = "{tcp_port:", SubnetPeer, { "tcp_port", SubnetPeer } ;<br/><br/>
+OpenTUDWithSource = "{udp_port:", SubnetPeer, { "udp_port", SubnetPeer } ;<br/><br/>
 EstablishConnectionToPeerViaProtocolValue = "{", ( GlobalPeer | SubnetPeer ), ":", Protocol, "}" ;<br/><br/>
+switch = On | Off ;<br/><br/>
+Protocol = "tcp" | "udp" ;<br/><br/>
 On = 1 ;<br/><br/>
 Off = 0 ;<br/><br/>
-Protocol = "tcp" | "udp" ;<br/><br/>
-on = "1" ;<br/><br/>
-off = "0" ;<br/><br/>
           {% endtrans %}
         </p>
       </section>