added L2O milestone 9 page and new project page Probnat.

2 files changed, 22 insertions, 10 deletions

diff --git a/template/l2o/index.html.j2 b/template/l2o/index.html.j2
index 9bccae22..9ce82969 100644
--- a/template/l2o/index.html.j2
+++ b/template/l2o/index.html.j2
@@ -260,7 +260,7 @@ time being, extensive manual testing and certainly bug fixing is necessary.
         <h4>Deliverable</h4><br/>
         <p>
           {% trans %}
-                GNUnet release running with new API.
+                GNUnet release running with new API. More  <a href="mile9.html">Details</a>.
           {% endtrans %}
         </p><br/>
       </section>
diff --git a/template/probnat/index.html.j2 b/template/probnat/index.html.j2
index 077543e3..2daffb1f 100644
--- a/template/probnat/index.html.j2
+++ b/template/probnat/index.html.j2
@@ -171,35 +171,47 @@ stack. Man pages for the cli applications. First release of all the implementati
         </p><br/>
       </section>
 
-      <h3><a name="milestone6" class="subnav-anchor"></a>{{ _("Milestone 6 Port Range Optimization") }}</h3><br/>
+      <h3><a name="milestone6" class="subnav-anchor"></a>{{ _("Milestone 6 Android Test Infrastructure") }}</h3><br/>
       <section>
         <p>
           {% trans %}
-            Detect likely port ranges (peers exchanging lists of 'working' IP+Port combinations).
+            In this milestone the test framework will be enhanced to run a headless android studio emulator on a namespace node. With this emulator an android device running on that node shall be emulated. Two devices running on different nodes should reach each other via the test framework network. For doing the network connection an app should run on each device. This app should do the networking with a small c library. With this c library we like to test if networking and file access is possible with a c library running using the NDK of Android.
             {% endtrans %}
         </p><br/>
         <h4>Deliverable</h4><br/>
         <p>
           {% trans %}
-                Test case with setup using specific port ranges testing use of port subset. First
-optimization release.
+                The deliverable of this milestone is twofold: the scripts for automation and the automated tests themselves, and a report on the outcome of these tests. If the test case starting an Android app on two nodes doing network communication between those two apps and each app accessing its own filesystem will not work as expected, the task includes an overview of potential approaches for achieving the desired outcomes in other ways.
           {% endtrans %}
         </p><br/>
       </section>
 
-      <h3><a name="milestone6" class="subnav-anchor"></a>{{ _("Milestone 7 Optimization") }}</h3><br/>
+      <h3><a name="milestone6" class="subnav-anchor"></a>{{ _("Milestone 7 GNUnet event loop on Android") }}</h3><br/>
       <section>
         <p>
           {% trans %}
-            Prioritize likely working IP addresses (no point in trying to go from 10.x to 192.168.x). There might
-be optimization we do not know anything about yet.
+            The c library should also start the GNUnet event loop. Therefore the library will be enhanced by a minimal part of the GNUnet stack to start the event loop. The testing code will be enhanced to use the event loop.
             {% endtrans %}
         </p><br/>
         <h4>Deliverable</h4><br/>
         <p>
           {% trans %}
-                Test case with setup using specific IP addresses testing if not all available IP addresses
-are used. Test cases testing general optimization. Second optimization release.
+                The deliverable of this milestone is twofold: the scripts for automation and the automated tests themselves, and a report on the outcome of these tests. If the test case testing the same functionality as in milestone 6, but using the GNUnet event loop, will not work as expected, the task includes an overview of potential approaches for achieving the desired outcomes in other ways.
+          {% endtrans %}
+        </p><br/>
+      </section>
+
+      <h3><a name="milestone6" class="subnav-anchor"></a>{{ _("Milestone 8 Enhance GNUnet stack on Android") }}</h3><br/>
+      <section>
+        <p>
+          {% trans %}
+            The working test cases of milestone 6 and 7 are prerequisites to tackle this milestone! The library will be enhanced to incorporate the parts of the GNUnet stack necessary to run the test case implemented in the milestones 1 -4.
+            {% endtrans %}
+        </p><br/>
+        <h4>Deliverable</h4><br/>
+        <p>
+          {% trans %}
+                Test case testing the same functionality as in milestone 1 - 4 running on Android.
           {% endtrans %}
         </p><br/>
       </section>