From 8670db9d7faf33f35789a4e344c52228b40f71f2 Mon Sep 17 00:00:00 2001 From: mrpa Date: Wed, 17 Mar 2021 01:05:26 +0100 Subject: Updated the relevant pictures in all books with the new naming protocol. Change-Id: I3c5b846b368520f073266738baa770e3ee19f43f Signed-off-by: mrpa --- .../doc/images/ChainedVNFsService_setup.png | Bin 105328 -> 83776 bytes .../doc/images/autofw_testh_overview.png | Bin 92459 -> 60150 bytes .../doc/images/environment_basicsetup.png | Bin 97013 -> 79325 bytes .../doc/images/br_to_br_conn_overview.png | Bin 133012 -> 56307 bytes .../doc/images/br_to_br_conn_setup.png | Bin 99837 -> 38971 bytes .../doc/images/trgt.png | Bin 49114 -> 50826 bytes .../doc/images/trgt.svg | 197 ++- .../doc/images/trgt_servicechain.png | Bin 67568 -> 69317 bytes .../doc/images/trgt_servicechain.svg | 1263 ++++++++++---------- .../doc/images/uc_clavister_bridge.png | Bin 34561 -> 36145 bytes .../doc/images/uc_clavister_bridge.svg | 145 ++- .../doc/images/uc_clavister_sriov.png | Bin 38010 -> 40185 bytes .../doc/images/uc_clavister_sriov.svg | 142 +-- .../doc/images/uc_enea_test_vnf.png | Bin 36212 -> 37660 bytes .../doc/images/uc_enea_test_vnf.svg | 105 +- .../doc/images/uc_fortigate_fw.png | Bin 25416 -> 27026 bytes .../doc/images/uc_fortigate_fw.svg | 190 +-- .../doc/images/uc_fortigate_sdwan.png | Bin 43532 -> 45248 bytes .../doc/images/uc_fortigate_sdwan.svg | 312 +++-- .../doc/images/uc_vnf_chaining.png | Bin 39325 -> 41097 bytes .../doc/images/uc_vnf_chaining.svg | 202 ++-- .../doc/images/high_av_setup.png | Bin 100018 -> 66687 bytes .../doc/images/vnf_space.png | Bin 44338 -> 39641 bytes 23 files changed, 1208 insertions(+), 1348 deletions(-) mode change 100755 => 100644 doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png mode change 100755 => 100644 doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png mode change 100755 => 100644 doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png mode change 100755 => 100644 doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png mode change 100755 => 100644 doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png mode change 100755 => 100644 doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png index a345989..0329450 100755 Binary files a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png and b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png differ diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png index a597a91..a384877 100755 Binary files a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png and b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png differ diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png index 6bd35d4..c30dcfd 100755 Binary files a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png and b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png differ diff --git a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png index 10984da..1367d32 100644 Binary files a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png and b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png differ diff --git a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png index 8f18afc..12e45f9 100644 Binary files a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png and b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png differ diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png index 791f542..2977524 100644 Binary files a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png and b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png differ diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.svg index d933a63..86f4d12 100755 --- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.svg +++ b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.svg @@ -1,6 +1,4 @@ - - + showborder="false" + inkscape:document-rotation="0" /> @@ -590,9 +589,9 @@ id="text6066" y="68.725212" x="168.60965" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" xml:space="preserve"> Legend: - Connection via cloud/internet:- Back to Back: BTB- Flow rules: @@ -752,20 +749,16 @@ height="25.079741" x="872" y="137.70079" /> + + id="text947" /> uCPE Device + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">uCPE Device Internet - - - uCPEManager - + id="g222"> + + Enea Edge Management Web Interface (128T) https://<IP>:60001 ibm_br + style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">ibm_br lan_br + style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">lan_br + id="text15008-4" /> Test Machine + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Test Machine 128T + id="text5981-9" /> .1 + style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.1 .2 + style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.2 .1 + style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.1 .2 + style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.2 192.168.64.0/24 + style="writing-mode:lr-tb;stroke-width:0.264583">192.168.64.0/24 10.0.0.0/24 + style="writing-mode:lr-tb;stroke-width:0.264583">10.0.0.0/24 diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png index da0824d..7cb5af0 100644 Binary files a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png and b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png differ diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.svg index 931bcaf..4bd6d85 100755 --- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.svg +++ b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.svg @@ -1,6 +1,4 @@ - - + inkscape:version="1.0.2 (e86c870, 2021-01-15)" + sodipodi:docname="trgt_servicechain.svg" + inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\trgt_servicechain.png" + inkscape:export-xdpi="65" + inkscape:export-ydpi="65"> + showborder="false" + inkscape:document-rotation="0" /> @@ -569,7 +571,7 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="Template Pieces" - style="display:inline" + style="display:none" transform="translate(-1.4460939,-31.103178)"> + style="fill:#c48ed1;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" /> + style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.288961;stroke-opacity:1" /> OVS Bridge @@ -635,37 +637,37 @@ id="path8471-3-2-4" inkscape:connector-curvature="0" /> @@ -688,13 +690,13 @@ inkscape:connector-curvature="0" /> Legend: - Connection via cloud/internet:- Back to Back: BTB- Flow rules: + style="fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-opacity:1"> + style="fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-width:0.410666;stroke-opacity:1" /> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" + xml:space="preserve" /> - - - + + uCPE Device - - - - uCPE Device + + + + Internet - - - - uCPEManager - - + id="tspan6009-5" + sodipodi:role="line">Internet + - - - - ibm_br - - + rx="5.9960117" + y="241.95555" + x="237.52919" + height="32.516785" + width="54.967422" + id="rect5992" + style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.301228;stroke-opacity:1" /> + Enea Edge Management + + + + + width="8.1726856" + id="rect6098-9" + style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.118224;stroke-opacity:1" + transform="rotate(-90)" /> ibm_br + + + + lsfc_br + + + + lsfc_br - - - - 128T - - 128T + + LAN - LAN + WAN - WAN + MGMT - - - - - MGMT + + + + + .2 - .2 + .1 - - + id="tspan2693-95" + sodipodi:role="line">.1 + + + + id="g2177" + transform="matrix(0.36573648,0,0,0.36628718,-55.69298,80.968281)"> + id="g2160"> + - + id="g2136" + transform="translate(-0.08009955)"> + id="g2102"> - - - - - - - - - - + id="g2086"> + + - - - - + id="g2102-4" + transform="translate(-23.633146)"> + + + + - - + id="g2102-9" + transform="rotate(180,44.251401,261.95726)"> + + + + + + + + + Test Machine - - Test Machine + + .2 - - .2 + + 192.168.64.0/24 + id="tspan2768" + sodipodi:role="line">192.168.64.0/24 + - - - vnf_mgmt_br - + id="g2691" + transform="translate(-58.125198,-0.52916555)"> + vnf_mgmt_br + + .1 - .1 + 10.0.0.0/24 - - - - 10.0.0.0/24 + + + + lan_br - - - - lan_br + + + + Fortigate - - + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583" + id="tspan5983-8">Fortigate + + LAN - LAN + WAN - WAN + MGMT - - MGMT + + .3 - .3 + .1 - .1 + 172.16.1.0/24 - 172.16.1.0/24 + .2 - - + id="tspan2693-9-4-7" + sodipodi:role="line">.2 + + + - - - - + id="g1489" + style="fill:#ab9d92;fill-opacity:0.643137" + transform="matrix(1.2261286,0,0,1.052617,-59.360811,-7.5277952)"> + + + Web Interface(128T) https://<IP>:60001(Fortigate) https://<IP>:60002 - + style="font-size:7.05556px;writing-mode:lr-tb;stroke-width:0.264583" + id="tspan1727">Web Interface(128T) https://<IP>:60001(Fortigate) https://<IP>:60002 diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png old mode 100755 new mode 100644 index 6366b61..97492ca Binary files a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png and b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png differ diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.svg index 6aafc23..2890881 100755 --- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.svg +++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.svg @@ -1,6 +1,4 @@ - - image/svg+xml - + @@ -414,17 +412,17 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="713" + inkscape:window-width="1920" + inkscape:window-height="1017" id="namedview4" showgrid="false" - inkscape:zoom="0.62" - inkscape:cx="570.58298" - inkscape:cy="298.20108" + inkscape:zoom="2.48" + inkscape:cx="584.97142" + inkscape:cy="325.32512" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="layer3" + inkscape:current-layer="layer5" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" @@ -432,7 +430,8 @@ showguides="true" inkscape:guide-bbox="true" inkscape:showpageshadow="false" - showborder="false" /> + showborder="false" + inkscape:document-rotation="0" /> Legend: - Connection via cloud/internet:- Connection via cloud/internet:- VPN/Back to Back (BTB): VPN/Back to Back (BTB):- Flow rules: @@ -518,10 +514,7 @@ y="389.75635" x="987.85223" id="image1509" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAACCAYAAACg5gd8AAAABHNCSVQICAgIfAhkiAAAAC5JREFU -CJlj/CIo+P//jx8MDN+/M9AT8DQ0CLOwhIUVE6Wamfk/k4jIFyra/wkAZPAMTyDetBwAAAAASUVO -RK5CYII= -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAACCAYAAACg5gd8AAAABHNCSVQICAgIfAhkiAAAAC5JREFU CJlj/CIo+P//jx8MDN+/M9AT8DQ0CLOwhIUVE6Wamfk/k4jIFyra/wkAZPAMTyDetBwAAAAASUVO RK5CYII= " preserveAspectRatio="none" height="2" width="30.799999" /> @@ -534,29 +527,32 @@ RK5CYII= style="display:inline" sodipodi:insensitive="true"> - - uCPE Manager + + + Enea Edge Management + Internet + style="font-size:24px;stroke-width:1">Internet + id="text16006" /> uCPE Device 2 Iperf clientIperf client Iperf server 192.168.20.20 192.168.10.10 bridge + style="font-size:18.6667px;writing-mode:lr-tb;stroke-width:1">bridge uCPE Device 1 Clavister bridge + style="font-size:18.6667px;writing-mode:lr-tb;stroke-width:1">bridge - - + inkscape:guide-bbox="true" + inkscape:document-rotation="0"> image/svg+xml - + @@ -607,7 +606,8 @@ height="71.385147" x="73.126244" y="-106.76833" /> + + + id="text6115" /> @@ -648,7 +644,7 @@ style="display:inline"> Legend: - Connection via cloud/internet:- VPN/Back to Back (BTB):- Flow rules: Internet + id="g216"> @@ -756,42 +749,32 @@ height="24.0366" width="55.009563" id="rect5992" - style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1" /> + style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1" /> + style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + xml:space="preserve" /> uCPE Manager + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977" + y="120.33696" + x="126.71664" + sodipodi:role="line">Enea Edge Management uCPE Device2 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">uCPE Device2 @@ -917,25 +900,25 @@ rx="4.99999" /> Iperf server 192.168.10.10 SR-IOV + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.276627">SR-IOV Iperf clientIperf client 192.168.20.20 uCPE Device1 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">uCPE Device1 SR-IOV + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none">SR-IOV Clavister diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png old mode 100755 new mode 100644 index 48ff9cc..be97bc0 Binary files a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png and b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png differ diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.svg index 8e692f2..fc71729 100755 --- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.svg +++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.svg @@ -1,6 +1,4 @@ - - @@ -513,25 +511,26 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.0610016" - inkscape:cx="543.91141" - inkscape:cy="26.216313" + inkscape:zoom="1.2316035" + inkscape:cx="337.42354" + inkscape:cy="213.58292" inkscape:document-units="mm" - inkscape:current-layer="svg8" + inkscape:current-layer="layer2" showgrid="false" inkscape:showpageshadow="false" showborder="true" showguides="true" inkscape:guide-bbox="true" - inkscape:window-width="1858" - inkscape:window-height="1177" + inkscape:window-width="1920" + inkscape:window-height="1017" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" - fit-margin-bottom="0" /> + fit-margin-bottom="0" + inkscape:document-rotation="0" /> @@ -575,9 +574,9 @@ id="text6066" y="68.725212" x="168.60965" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" xml:space="preserve"> + id="g158" + inkscape:export-filename="E:\PortableApps\WinSCPPortable\App\winscp\scp57962\nfs\hosts\sestonas06\homes\mrpa\docu_work\NFV-Access\branches\feature_USERDOCAP-636\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\uc_enea_test_vnf.png" + inkscape:export-xdpi="65" + inkscape:export-ydpi="65"> + style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.241189;stroke-opacity:1" /> uCPE Manager + style="font-size:5.64444px;stroke-width:0.264583" + y="391.50983" + x="37.162312" + sodipodi:role="line">Enea Edge Management BTB + style="stroke-width:0.264583">BTB uCPE Device 1 pktgen_dpdk @@ -809,14 +810,14 @@ inkscape:connector-curvature="0" /> uCPE Device 2 testpmd_fwd @@ -851,14 +852,14 @@ rx="4.99999" /> testpmd_term Legend: - Connection via cloud/internet:- Back to Back: BTB- Flow rules: diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png old mode 100755 new mode 100644 index fe18850..f8ae39a Binary files a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png and b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png differ diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.svg index 191ec5e..160c8b0 100755 --- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.svg +++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.svg @@ -1,6 +1,4 @@ - - + inkscape:guide-bbox="true" + inkscape:document-rotation="0" /> @@ -460,7 +459,7 @@ image/svg+xml - + @@ -491,26 +490,16 @@ id="text15008-4" y="60.119961" x="53.59409" - style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332" - xml:space="preserve"> + style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583" + xml:space="preserve" /> + + id="text1502" /> wan_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">wan_br lan1_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.264583">lan1_br lan2_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.264583">lan2_br Fortigate + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.264583">Fortigate uCPE Device + + + id="text6115" /> @@ -785,7 +767,7 @@ style="display:inline"> Legend: - Connection via cloud/internet: Test Test + + - Internet + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Internet uCPEManager + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.0058px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle" + id="flowPara2138" /> + + + Enea Edge Management + + diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png old mode 100755 new mode 100644 index cd82461..b71b02e Binary files a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png and b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png differ diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg index 4255bf6..3de54dd 100755 --- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg +++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg @@ -1,6 +1,4 @@ - - + showborder="false" + inkscape:document-rotation="0" /> Cloud + style="font-size:8.46667px;stroke-width:0.264583">Cloud uCPEuCPEDevice uCPEManager @@ -568,9 +567,9 @@ id="text6011" y="111.3953" x="104.96505" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" xml:space="preserve"> + style="display:inline" + sodipodi:insensitive="true"> - @@ -774,64 +765,73 @@ inkscape:connector-curvature="0" id="path5091-2" d="m 445.81065,75.822009 a 38.855204,52.805708 0 0 0 -25.4146,12.949601 27.874385,29.472953 0 0 0 -5.83847,-0.669151 27.874385,29.472953 0 0 0 -23.90343,14.379051 38.701484,43.266581 0 0 0 -3.81757,-0.21342 38.701484,43.266581 0 0 0 -38.70176,43.26683 38.701484,43.266581 0 0 0 10.45454,29.52569 19.427603,20.876675 0 0 0 -0.62526,5.14477 19.427603,20.876675 0 0 0 19.42759,20.87671 19.427603,20.876675 0 0 0 6.81189,-1.33599 17.738246,34.385112 0 0 0 11.77104,8.70425 17.738246,34.385112 0 0 0 10.05859,-6.10906 32.097777,36.841192 0 0 0 22.88385,11.02119 32.097777,36.841192 0 0 0 24.82399,-13.52037 47.301991,30.700992 0 0 0 22.47804,3.69605 47.301991,30.700992 0 0 0 47.30198,-30.70098 47.301991,30.700992 0 0 0 -2.81288,-10.33994 36.611017,34.385112 0 0 0 11.83871,-25.27322 36.611017,34.385112 0 0 0 -36.60986,-34.3851 36.611017,34.385112 0 0 0 -15.08215,3.09888 38.855204,52.805708 0 0 0 -35.04424,-30.11573 z" - style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.96103942;stroke-opacity:1" /> + style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.961039;stroke-opacity:1" /> Internet - uCPEManager + + + Enea Edge Management + + + style="display:inline" + sodipodi:insensitive="true"> + id="text16006" /> uCPE Device 2 @@ -878,7 +878,7 @@ ry="1.8328245" /> @@ -917,7 +917,7 @@ id="g1507"> vnfmgmt_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">vnfmgmt_br Fortigate @@ -988,15 +988,15 @@ height="40.235157" width="69.460823" id="rect6098-9-0-8-7" - style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.44231871;stroke-opacity:1" + style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.442319;stroke-opacity:1" ry="9.5899591" /> lan_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br @@ -1058,27 +1058,18 @@ id="layer7" inkscape:label="Test Machines" style="display:inline" - transform="translate(-314.7295,-31.73299)"> + transform="translate(-314.7295,-31.73299)" + sodipodi:insensitive="true"> + id="text15008-4" /> + style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583" + xml:space="preserve" /> + style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583" + xml:space="preserve" /> + style="display:inline" + sodipodi:insensitive="true"> @@ -1222,23 +1194,23 @@ uCPE Device 1 @@ -1270,7 +1242,7 @@ transform="translate(-3.3059349,7.7197473)" id="g1576"> wan_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">wan_br lan_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br + id="text1355" /> vnfmgmt_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">vnfmgmt_br Fortigate + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1">Fortigate @@ -1422,7 +1390,8 @@ id="layer13" inkscape:label="Legend" transform="translate(-23.865391,-45.497822)" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> @@ -1431,38 +1400,35 @@ id="text4338" y="284.13779" x="-0.59244788" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)" xml:space="preserve">Legend: - Connection via cloud/internet:- VPN/BTB: diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png old mode 100755 new mode 100644 index d2527e5..6aaf4c0 Binary files a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png and b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png differ diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.svg index 67e0250..2bb15af 100755 --- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.svg +++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.svg @@ -1,6 +1,4 @@ - - + showborder="false" + inkscape:document-rotation="0" /> Cloud + style="font-size:8.46667px;stroke-width:0.264583">Cloud uCPEuCPEDevice uCPEManager @@ -293,9 +292,9 @@ id="text6011" y="111.3953" x="104.96505" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" xml:space="preserve"> + id="text16006" /> sfc_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">sfc_br dpdk + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">dpdk lan_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br lan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan wan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan wan_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">wan_br uCPE Device 2 + sfc_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">sfc_br wan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan lan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan @@ -851,7 +847,7 @@ x="53.709198" style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve"> wan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan lan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan lan_br + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br uCPE Device 1 Legend: - Connection via cloud/internet:- VPN/BTB: - VPN/BTB: + style="display:inline" + sodipodi:insensitive="true"> + id="text756" /> + style="display:inline;fill:none;stroke:#e90000;stroke-width:0.887434;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#e90000;stroke-width:0.887434;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:1.23514;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47028, 1.23514, 0.617569, 1.23514;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:1.23819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47638, 1.23819, 0.619094, 1.23819;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93169;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -1153,33 +1143,33 @@ inkscape:connector-curvature="0" id="path5091-2-9" d="m 285.79578,282.35384 a 38.855204,52.805708 0 0 0 -25.4146,12.9496 27.874385,29.472953 0 0 0 -5.83847,-0.66915 27.874385,29.472953 0 0 0 -23.90343,14.37905 38.701484,43.266581 0 0 0 -3.81757,-0.21342 38.701484,43.266581 0 0 0 -38.70176,43.26683 38.701484,43.266581 0 0 0 10.45454,29.52569 19.427603,20.876675 0 0 0 -0.62526,5.14477 19.427603,20.876675 0 0 0 19.42759,20.87671 19.427603,20.876675 0 0 0 6.81189,-1.33599 17.738246,34.385112 0 0 0 11.77104,8.70425 17.738246,34.385112 0 0 0 10.05859,-6.10906 32.097777,36.841192 0 0 0 22.88385,11.02119 32.097777,36.841192 0 0 0 24.82399,-13.52037 47.301991,30.700992 0 0 0 22.47804,3.69605 47.301991,30.700992 0 0 0 47.30198,-30.70098 47.301991,30.700992 0 0 0 -2.81288,-10.33994 36.611017,34.385112 0 0 0 11.83871,-25.27322 36.611017,34.385112 0 0 0 -36.60986,-34.3851 36.611017,34.385112 0 0 0 -15.08215,3.09888 38.855204,52.805708 0 0 0 -35.04424,-30.11573 z" - style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.96103942;stroke-opacity:1" /> + style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.961039;stroke-opacity:1" /> Internet + id="g219"> uCPEManager + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">Enea Edge Management + diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/high_av_setup.png b/doc/book-enea-nfv-access-getting-started/doc/images/high_av_setup.png index 23cc973..d119ecb 100644 Binary files a/doc/book-enea-nfv-access-getting-started/doc/images/high_av_setup.png and b/doc/book-enea-nfv-access-getting-started/doc/images/high_av_setup.png differ diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png b/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png index 1a5ddab..57ed581 100755 Binary files a/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png and b/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png differ -- cgit v1.2.3-54-g00ecf From e55c3d2a23de3eac0ae2f312b27a478e041b48e8 Mon Sep 17 00:00:00 2001 From: iosc Date: Fri, 19 Mar 2021 13:07:53 +0100 Subject: USERDOCAP-636 - all books changes Change-Id: I944098c2d726657c91edff3d62dc4a40fc8df8bb Signed-off-by: iosc --- doc/Makefile | 8 +- .../doc/about.xml | 2 +- .../doc/book.xml | 2 +- .../doc/licenses.xml | 4 +- .../swcomp.mk | 2 +- .../book-enea-nfv-access-auto-fw-th-user-guide.pdf | Bin 0 -> 401538 bytes .../doc/automation_framework_test_harness.xml | 364 ++++++++++----------- .../doc/book.xml | 2 +- .../doc/components.xml | 51 ++- .../doc/getting_started.xml | 32 +- .../doc/overview.xml | 23 +- .../doc/troubleshooting_guide.xml | 4 +- .../swcomp.mk | 2 +- .../doc/128t_vnf_router.xml | 6 +- .../doc/appendix_4.xml | 4 +- .../doc/appendix_5.xml | 6 +- .../doc/book.xml | 2 +- .../doc/clav_vnf_examples.xml | 4 +- .../doc/enea_test_vnf_examples.xml | 12 +- .../doc/forti_vnf_examples.xml | 8 +- .../doc/introduction.xml | 4 +- .../doc/service_chaining_128t_fortigate.xml | 4 +- .../doc/vnf_chaining.xml | 10 +- .../swcomp.mk | 2 +- .../doc/advanced_configurations.xml | 178 +++++----- .../doc/book.xml | 2 +- .../doc/grafana.xml | 209 ++++++------ .../doc/installation_guide.xml | 256 +++++++-------- .../doc/introduction.xml | 46 +-- .../doc/log_collector.xml | 46 +-- .../doc/net_config_options.xml | 123 +++---- .../doc/troubleshooting.xml | 74 ++--- .../doc/upgrade_ena.xml | 79 ++--- .../doc/vnf_mg.xml | 102 +++--- doc/book-enea-nfv-access-getting-started/swcomp.mk | 2 +- .../doc/about.xml | 2 +- .../doc/book.xml | 2 +- .../doc/licenses.xml | 10 +- .../swcomp.mk | 2 +- .../doc/about_release.xml | 36 +- doc/book-enea-nfv-access-release-info/doc/book.xml | 2 +- .../doc/known_bugs_and_limitations.xml | 37 +-- .../doc/main_changes.xml | 45 ++- doc/book-enea-nfv-access-release-info/swcomp.mk | 2 +- .../doc/book.xml | 2 +- .../doc/configuration.xml | 6 +- .../doc/overview.xml | 14 +- .../doc/sample_test_cases.xml | 153 +++++---- .../swcomp.mk | 2 +- .../doc/about.xml | 2 +- .../doc/book.xml | 2 +- .../swcomp.mk | 2 +- .../doc/about.xml | 2 +- .../doc/book.xml | 2 +- .../swcomp.mk | 2 +- 55 files changed, 1002 insertions(+), 1000 deletions(-) create mode 100644 doc/book-enea-nfv-access-auto-fw-th-user-guide/book-enea-nfv-access-auto-fw-th-user-guide.pdf diff --git a/doc/Makefile b/doc/Makefile index a0956d4..1a415b3 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -26,8 +26,8 @@ include init.mk #BUILDBOOT_XML := book-enea-nfv-access-release-info/doc/build_boot_generated.xml #BUILDBOOT_TEMPLATE := book-enea-nfv-access-release-info/doc/build_boot_template.xml -PKGDIFF_GEN_XML := book-enea-nfv-access-release-info/doc/pkgdiff_generated.xml -JIRA_ISSUES_GEN_XML := book-enea-nfv-access-release-info/doc/jiraissues_generated.xml +#PKGDIFF_GEN_XML := book-enea-nfv-access-release-info/doc/pkgdiff_generated.xml +#JIRA_ISSUES_GEN_XML := book-enea-nfv-access-release-info/doc/jiraissues_generated.xml MACHINE_LIST_XML := book-enea-nfv-access-release-info/doc/machine_list_generated.xml @@ -50,7 +50,7 @@ DOCBOOK_TO_BOOKDIR ?= yes DOCBOOK_CLEANTMP ?= yes #Components (books) in this subsystem. Now use all books found here -COMPONENTS := book-enea-nfv-access-auto-fw-th-open-source book-enea-nfv-access-auto-fw-th-user-guide book-enea-nfv-access-cmc-example-usecases book-enea-nfv-access-example-usecases book-enea-nfv-access-getting-started book-enea-nfv-access-platform-open-source book-enea-nfv-access-getting-started book-enea-nfv-access-ucpem-open-source book-enea-nfv-access-telemetry-open-source book-enea-nfv-access-release-info book-enea-nfv-access-system-test-specification book-enea-nfv-access-evalkit +COMPONENTS := book-enea-nfv-access-auto-fw-th-open-source book-enea-nfv-access-auto-fw-th-user-guide book-enea-nfv-access-cmc-example-usecases book-enea-nfv-access-example-usecases book-enea-nfv-access-getting-started book-enea-nfv-access-platform-open-source book-enea-nfv-access-ucpem-open-source book-enea-nfv-access-telemetry-open-source book-enea-nfv-access-release-info book-enea-nfv-access-system-test-specification book-enea-nfv-access-evalkit book-enea-nfv-access-auto-fw-open-source book-enea-nfv-access-auto-fw-user-guide # -------------------------------------------------------------- @@ -184,7 +184,7 @@ endif books: init # BOOKPACKAGES is defined in all book-*/swcomp.mk $(VERB)DISTRO_VERSION=`egrep '"EneaLinux_REL_VER">' $(ELTF_PARAMS_UPDATED) | sed 's/.*//;s/<\/phrase>.*//'` ; \ - BOOKVER="Enea NFV Access-$$DISTRO_VERSION"-$(shell date +"%Y.%m.%d"); \ + BOOKVER="Enea Edge-$$DISTRO_VERSION"-$(shell date +"%Y.%m.%d"); \ for book in $(BOOKPACKAGES); do \ for format in $(FORMAT); do \ $(MAKE) -f $(DOCBOOKMAKE)/make_docbook_standalone.mk BOOK=$$book FORMAT=$$format BOOK_VER="$$BOOKVER" books || exit 10; \ diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml index dbf06e3..4dc19aa 100644 --- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml +++ b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml @@ -6,7 +6,7 @@ This document contains the open source and license information pertaining to the Automation Framework and Test Harness provided with - Enea NFV Access . diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml index 3305873..f849ad4 100644 --- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml +++ b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml @@ -4,7 +4,7 @@ ]> - <trademark class="registered">Enea</trademark> NFV Access Automation Framework and Test Harness Open Source Report + <trademark class="registered">Enea</trademark> Edge Automation Framework and Test Harness Open Source Report Release Version - Configuration and Automation Framework for the uCPE Manager + Configuration and Automation Framework for the Edge Manager GUI. ENEA-SRC-R2 @@ -54,7 +54,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="element(EneaLinux_REL_VER/1)" /> - Configuration and Automation Framework for the uCPE Manager + Configuration and Automation Framework for the Edge Manager GUI. ENEA-EXAMPLE-R2 diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk b/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk index 2f2e677..702e86f 100644 --- a/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk +++ b/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk @@ -6,5 +6,5 @@ BOOK_VER ?= $(REL_VER)-dev DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print) BOOKPACKAGES := book-enea-nfv-access-auto-fw-th-open-source -BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) AF&TH Open Source Report" +BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) AF&TH Open Source Report" BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS) diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/book-enea-nfv-access-auto-fw-th-user-guide.pdf b/doc/book-enea-nfv-access-auto-fw-th-user-guide/book-enea-nfv-access-auto-fw-th-user-guide.pdf new file mode 100644 index 0000000..5d601c1 Binary files /dev/null and b/doc/book-enea-nfv-access-auto-fw-th-user-guide/book-enea-nfv-access-auto-fw-th-user-guide.pdf differ diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml index 5e6ba24..a569d59 100644 --- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml +++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml @@ -11,15 +11,15 @@ The /device folder contains Python scripts for adding uCPE device(s), receiving uCPE events' reports, removing a uCPE - device, waiting for a uCPE device to connect to the uCPE Manager, as well + device, waiting for a uCPE device to connect to the Enea Edge Management, as well as scripts for adding and removing an offline configuration store. This folder also contains scripts for uploading and removing an NFVA image into - the uCPE Manager, and for installing and activating a NFVA image on a uCPE + the Enea Edge Management, and for installing and activating a NFVA image on a uCPE Device. The /customScripts folder contains Python scripts - for uploading custom scripts onto the uCPE Manager and uCPE device(s), for - removing custom scripts from the uCPE Manager and uCPE device(s). + for uploading custom scripts onto the Enea Edge Management and uCPE device(s), for + removing custom scripts from the Enea Edge Management and uCPE device(s). The /network folder contains Python scripts for binding or unbinding a network interface to and from a uCPE device (DPDK @@ -79,7 +79,7 @@ the path to the file describing the test cases to be performed against the designated script. - Steps for running the Python unit-test suite on the uCPE Manager + Steps for running the Python unit-test suite on the Enea Edge Management are provided below.
@@ -88,16 +88,16 @@ $ python unittestSuite.py -h Usage: unittestSuite.py [options] -Run selected unit-test suite against Enea uCPE Manager. +Run selected unit-test suite against Enea Edge Management. Options: --version show program's version number and exit -h, --help show this help message and exit -u USERNAME, --username=USERNAME - Enea uCPE Manager login username + Enea Edge Management login username -p PASSWORD, --password=PASSWORD - Enea uCPE Manager login password - -H HOST, --host=HOST Enea uCPE Manager host name or IP address + Enea Edge Management login password + -H HOST, --host=HOST Enea Edge Management host name or IP address -n DEVICENAME, --deviceName=DEVICENAME Name of vCPE device (Virtual Infrastructure Manager) -s SUITEFILE, --suite=SUITEFILE @@ -234,8 +234,8 @@ consoleLoggingLevel = logging.INFO username - The user authentication used to log into the uCPE - Manager. This can be overwritten by setting the Python + The user authentication used to log into the + Enea Edge Management. This can be overwritten by setting the Python unit-test suite command line option -u. @@ -243,7 +243,7 @@ consoleLoggingLevel = logging.INFO password - The password used to log into the uCPE Manager. This + The password used to log into the Enea Edge Management. This can be overwritten by setting the Python unit-test suite command line option -p. @@ -251,7 +251,7 @@ consoleLoggingLevel = logging.INFO host - The IP address of the uCPE Manager host. This can be + The IP address of the Enea Edge Management host. This can be overwritten by setting the Python unit-test suite command line option -H. @@ -540,7 +540,7 @@ OK Adding a uCPE Device Steps for adding, configuring and running a uCPE device onto the - uCPE manager are described below . + Enea Edge Management are described below .
Script Options @@ -548,16 +548,16 @@ OK $ python addDevice.py -h Usage: addDevice.py [options] -Add a uCPE device in Enea uCPE Manager. +Add a uCPE device in Enea Edge Management. Options: --version show program's version number and exit -h, --help show this help message and exit -u USERNAME, --username=USERNAME - Enea uCPE Manager login username + Enea Edge Management login username -p PASSWORD, --password=PASSWORD - Enea uCPE Manager login password - -H HOST, --host=HOST Enea uCPE Manager host name or IP address + Enea Edge Management login password + -H HOST, --host=HOST Enea Edge Management host name or IP address -f DEVICEFILE, --file=DEVICEFILE File containing uCPE Information in JSON format @@ -615,7 +615,7 @@ Options: 2019-03-07 17:33:10,756 - INFO: Add uCPE device 2019-03-07 17:33:10,975 - DEBUG: Login successful on host 'localhost' 2019-03-07 17:33:10,979 - DEBUG: Session token is: 508b6ea2-40ee-11e9-a81f525400d08e1d -2019-03-07 17:33:11,049 - DEBUG: Add new device 'intelc3850-2' to uCPE Manager host +2019-03-07 17:33:11,049 - DEBUG: Add new device 'intelc3850-2' to Enea Edge Management host 2019-03-07 17:33:11,483 - INFO: Done 2019-03-07 17:33:11,501 - DEBUG: Logging out and exiting....
@@ -624,7 +624,7 @@ Options:
Removing a uCPE Device - Steps for removing a uCPE device from the uCPE manager are + Steps for removing a uCPE device from the Enea Edge Management are described below.
@@ -633,16 +633,16 @@ Options: $ python removeDevice.py -h Usage: removeDevice.py [options] -Remove a uCPE from Enea uCPE Manager. +Remove a uCPE from Enea Edge Management. Options: --version show program's version number and exit -h, --help show this help message and exit -u USERNAME, --username=USERNAME - Enea uCPE Manager login username + Enea Edge Management login username -p PASSWORD, --password=PASSWORD - Enea uCPE Manager login password - -H HOST, --host=HOST Enea uCPE Manager host name or IP address + Enea Edge Management login password + -H HOST, --host=HOST Enea Edge Management host name or IP address -f DEVICEFILE, --file=DEVICEFILE File containing uCPE Information in JSON format @@ -689,7 +689,7 @@ Options: 2019-03-07 17:33:56,835 - INFO: Remove uCPE device 2019-03-07 17:33:56,856 - DEBUG: Login successful on host 'localhost' 2019-03-07 17:33:56,856 - DEBUG: Session token is: 6bebcb43-40ee-11e9-a81f525400d08e1d -2019-03-07 17:33:56,856 - DEBUG: Delete device 'intelc3850-2' from uCPE Manager +2019-03-07 17:33:56,856 - DEBUG: Delete device 'intelc3850-2' from Enea Edge Management host 2019-03-07 17:33:56,875 - DEBUG: Found device with name 'intelc3850-2' 2019-03-07 17:33:57,159 - INFO: Done @@ -701,7 +701,7 @@ host Waiting a uCPE Device Steps and details for how to Wait a uCPE device to connect to the - uCPE Manager after installation, are described below. + Enea Edge Management after installation, are described below.
Script Options @@ -709,16 +709,16 @@ host $ python waitDeviceUp.py -h Usage: waitDeviceUp.py [options] -Wait for uCPE to connect to the Enea uCPE Manager after installation. +Wait for uCPE to connect to the Enea Edge Management after installation. Options: --version show program's version number and exit -h, --help show this help message and exit -u USERNAME, --username=USERNAME - Enea uCPE Manager login username + Enea Edge Management login username -p PASSWORD, --password=PASSWORD - Enea uCPE Manager login password - -H HOST, --host=HOST Enea uCPE Manager host name or IP address + Enea Edge Management login password + -H HOST, --host=HOST Enea Edge Management host name or IP address -f DEVICEFILE, --file=DEVICEFILE File containing uCPE Information in JSON format -t TIMEOUT, --timeout=TIMEOUT @@ -779,7 +779,7 @@ Options: Printing the uCPE Device Log Steps and details on how to Print the events log for a specific - uCPE device installed in the uCPE Manager, are explained below. + uCPE device installed in the Enea Edge Management, are explained below.