Merge "evalkit doc: update flexiWAN manager info" into rocko

2 files changed, 47 insertions, 26 deletions

diff --git a/doc/book-enea-nfv-access-evalkit/doc/appendix_1.xml b/doc/book-enea-nfv-access-evalkit/doc/appendix_1.xml
index 0895bcb..7f6aff7 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/appendix_1.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/appendix_1.xml
@@ -21,8 +21,8 @@
   </note>
 
   <para>Unpack the
-  <filename>flexiwan/flexiwan-cloud-init-example.tar.gz</filename> and check
-  the README file for more details: <programlisting>tar -zxf flexiwant-cloud-init-example.tar.gz
+      <filename>flexiwan/flexiwan-cloud-init-example.tar.gz</filename>:
+      <programlisting>tar -zxf flexiwant-cloud-init-example.tar.gz
 cd flexiwan/cloud-init-example/</programlisting></para>
 
   <para>To generate the cloud-init iso image:</para>
@@ -32,4 +32,4 @@ cd flexiwan/cloud-init-example/</programlisting></para>
 
   <para>The <filename>flexiWAN_cloudinit.iso</filename> file can be used to
   instantiate the flexiWAN VNF on NFV Access.</para>
-</appendix>
\ No newline at end of file
+</appendix>
diff --git a/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml b/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
index aeed4ed..70cf44f 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
@@ -177,7 +177,7 @@
             <row>
               <entry>Interfaces to add (click the " + " button):</entry>
 
-              <entry>wan and lan</entry>
+              <entry>wan and lan. Please make sure to add them in this order.</entry>
             </row>
 
             <row>
@@ -263,7 +263,7 @@
             <row>
               <entry>Interfaces to add (click the " + " button):</entry>
 
-              <entry>wan, lan and mgmt.</entry>
+              <entry>wan, lan and mgmt. Please make sure to add them in this order.</entry>
             </row>
 
             <row>
@@ -1345,27 +1345,27 @@
     <title>FlexiWAN configuration</title>
 
     <para>Connect to <ulink
-    url="https://app.flexiwan.com">https://app.flexiwan.com</ulink> and make
-    sure you have an account and at least two valid device tokens. For more
+    url="https://manage.flexiwan.com">https://manage.flexiwan.com</ulink> and make
+    sure to have an account and at least two valid device tokens. For more
     information please contact the flexiWAN VNF provider.</para>
 
-    <para>Proceed to the Inventory menu, click on <literal>Devices</literal>,
+    <para>Proceed to the Inventory menu and click on <literal>Devices</literal>,
     the devices should already be present and need to be configured.</para>
 
     <para><emphasis role="bold">How to configure a device</emphasis></para>
 
     <orderedlist>
       <listitem>
-        <para>Select each device and make sure to set the following
+        <para>Select each Unknown device and make sure to set the following
         values:</para>
 
         <para><table>
             <tgroup cols="2">
               <tbody>
                 <row>
-                  <entry>Device1(ucpe1)</entry>
+                  <entry>Device1 (ucpe1)</entry>
 
-                  <entry>Device2(ucpe2)</entry>
+                  <entry>Device2 (ucpe2)</entry>
                 </row>
 
                 <row>
@@ -1375,11 +1375,9 @@
                 </row>
 
                 <row>
-                  <entry>Description (set IPv4 for the second interface
-                  (ens3)): <literal>10.0.1.1/24</literal></entry>
+                  <entry>Description: uCPE device1 </entry>
 
-                  <entry>Description (set IPv4 for the second interface
-                  (ens3)): <literal>10.0.2.1/24</literal></entry>
+                  <entry>Description: uCPE device2 </entry>
                 </row>
 
                 <row>
@@ -1389,10 +1387,31 @@
                 </row>
 
                 <row>
-                  <entry>Click "Update Device".</entry>
+                  <entry>Click "Update Device" button.</entry>
 
-                  <entry>Click "Update Device".</entry>
+                  <entry>Click "Update Device" button.</entry>
                 </row>
+
+                <row>
+                  <entry>Select Interfaces tab.</entry>
+
+                  <entry>Select Interfaces tab.</entry>
+                </row>
+
+                <row>
+                  <entry>Set IPv4 for the second interface
+                  (ens3): <literal>10.0.1.1/24</literal></entry>
+
+                  <entry>Set IPv4 for the second interface
+                  (ens3): <literal>10.0.2.1/24</literal></entry>
+                </row>
+
+                <row>
+                  <entry>Click "Update Interfaces".</entry>
+
+                  <entry>Click "Update Interfaces".</entry>
+                </row>
+
               </tbody>
             </tgroup>
           </table></para>
@@ -1400,12 +1419,13 @@
         <note>
           <para>uCPE devices can installed under the same local network, i.e.
           having the same public IP, or on different networks (different
-          public IPs). If both devices are installed under same local network
-          (same public IP), delete the public IP address from the device
-          configuration before creating a tunnel: <ulink
-          url="https://app.flexiwan.com">https://app.flexiwan.com</ulink>
+          public IPs). If both devices are installed under the same local network
+            (the same public IP), delete the public IP address from the <literal>Interfaces</literal>
+          configuration tab before creating a tunnel: <ulink
+          url="https://manage.flexiwan.com">https://manage.flexiwan.com</ulink>
           -&gt; <literal>Inventory</literal> -&gt; <literal>Devices</literal>
-          -&gt; <literal>&lt;device&gt;</literal> -&gt; Public IP.</para>
+          -&gt; <literal>&lt;device&gt;</literal> -&gt; <literal>Interfaces</literal>
+          -&gt; Public IP.</para>
         </note>
       </listitem>
 
@@ -1421,9 +1441,10 @@
 
       <listitem>
         <para>Select the main top up checkbox in order to select all devices
-        and hit "Create Tunnels". At this moment a direct connection should be
-        available between those two devices. You can check if the tunnel was
-        created by selecting Inventory -&gt; Tunnels.</para>
+            and hit "Actions" -&gt; "Create Tunnels". At this moment a direct
+            connection should be available between those two devices. Check to 
+          see if the tunnel was created by selecting <literal>Inventory</literal>
+          -&gt; <literal>Tunnels</literal>.</para>
       </listitem>
     </orderedlist>
   </section>
@@ -1438,4 +1459,4 @@
     <para>The management interface can be accessed from a web browser at:
     <literal>https://&lt;deviceIP&gt;:60002</literal></para>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>