From f12ff03a804963032c77db7821dd364f39066252 Mon Sep 17 00:00:00 2001 From: Robert Paál Date: Fri, 10 Jan 2020 10:17:13 +0100 Subject: BookExampleUseCases: Added pictures to use cases. Change-Id: Icb5a2962558bcb54854d5088bd5ce4882016444c --- .../doc/clav_vnf_examples.xml | 26 +- .../doc/forti_vnf_examples.xml | 33 +- .../doc/images/uc_clavister_bridge.png | Bin 71833 -> 34561 bytes .../doc/images/uc_clavister_bridge.svg | 1234 ++++++-------- .../doc/images/uc_clavister_sriov.png | Bin 59756 -> 38010 bytes .../doc/images/uc_clavister_sriov.svg | 1024 ++++++------ .../doc/images/uc_enea_test_vnf.png | Bin 54473 -> 36212 bytes .../doc/images/uc_enea_test_vnf.svg | 197 ++- .../doc/images/uc_fortigate_fw.png | Bin 41760 -> 25416 bytes .../doc/images/uc_fortigate_fw.svg | 830 +++++---- .../doc/images/uc_fortigate_sdwan.png | Bin 63135 -> 43402 bytes .../doc/images/uc_fortigate_sdwan.svg | 1341 ++++++++------- .../doc/images/uc_vnf_chaining.png | Bin 58717 -> 39325 bytes .../doc/images/uc_vnf_chaining.svg | 1763 ++++++++------------ .../doc/vnf_chaining.xml | 21 +- 15 files changed, 2951 insertions(+), 3518 deletions(-) diff --git a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml index 806430a..7d69d43 100644 --- a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml +++ b/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml @@ -40,7 +40,7 @@ NFV Access release: - clavister-cloudinit.conf. + clavister-cloudinit.conf. @@ -61,6 +61,17 @@ applications. The uCPE devices are connected using OVS-DPDK bridges. +
+ Clavister VNF using an Open vSwitch bridge + + + + + + +
+
Use-case Setup @@ -294,6 +305,17 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10 above, in this scenario however, the uCPE devices are connected using SR-IOV, with two virtual functions. +
+ Clavister VNF using SR-IOV + + + + + + +
+
Use-case Setup @@ -329,4 +351,4 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10 above.
- + \ No newline at end of file diff --git a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml index 06b1701..1187b07 100644 --- a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml +++ b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml @@ -66,6 +66,17 @@ xpointer="element(book_enea_nfv_access_example_usecases/1)" /> Manual. +
+ Fortigate VNF as a Firewall + + + + + + +
+
Use-case Setup @@ -268,6 +279,17 @@ Example SD-WAN configurations for the FortiGate VNF are provided by Enea. +
+ Fortigate VNF as an SD-WAN or a VPN + + + + + + +
+
Use-case Setup @@ -381,9 +403,12 @@ a license file entry. - - The order of the interfaces that need to be added must be exactly - as listed above or else onboarding and in turn instantiation will fail. + + + The order of the interfaces that need to be added must be + exactly as listed above or else onboarding and in turn instantiation + will fail. + Instantiating the FortiGate VNF: @@ -557,4 +582,4 @@ virsh console <id of FortiGate VNF>
- + \ No newline at end of file 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 index 48b5782..6366b61 100755 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 6f3d420..6aafc23 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 @@ -13,13 +13,13 @@ version="1.1" id="svg2" width="1118.8589" - height="425.12503" - viewBox="0 0 1118.8589 425.12503" - sodipodi:docname="uc_clavister_bridge.svg" + height="430.20746" + viewBox="0 0 1118.8589 430.20746" + sodipodi:docname="uc_clavister_bridge_new.svg" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - inkscape:export-filename="L:\docu_work\el_releases-nfv-access\doc\book-enea-nfv-access-example-usecases\doc\images\clavister_vnf_diagram.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96"> + inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_clavister_bridge_new.png" + inkscape:export-xdpi="51.48" + inkscape:export-ydpi="51.48"> @@ -28,7 +28,7 @@ image/svg+xml - + @@ -154,22 +154,6 @@ transform="matrix(1.1,0,0,1.1,1.1,0)" inkscape:connector-curvature="0" /> - - - @@ -211,7 +195,7 @@ @@ -413,12 +397,12 @@ + id="filter4332-4"> + id="feBlend4334-1" /> + showborder="false" /> - - - - BTB - - - uCPE Manager - - + id="g11695"> - - - - - - - - - - Internet - + + Internet + y="221.1394" /> + - + id="g9849" + transform="translate(0,-2.70139)"> - - - - - - - - - uCPE Device 2 - - - Iperf client - - - Iperf server - - - - - 192.168.20.20 - 192.168.10.10 - - - - bridge - - dpdk - - - - - - - + id="g9810"> + id="g9842"> - uCPE Device 1 - - - - - - + + uCPE Device 2 + + + Iperf client + + + Iperf server + + + + + 192.168.20.20 + 192.168.10.10 + + id="g224-9" + style="display:inline" + transform="translate(394.32478,-1.0086352)"> - Clavister + style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.63764977;stroke-opacity:1" + id="rect6098-9-6-7" + width="51.501362" + height="112.77705" + x="-312.70386" + y="-177.55771" + rx="12.87534" + transform="scale(-1)" /> 192.168.10.1 - 192.168.20.1 - - - - - bridge - - dpdk + y="293.63873" + style="font-size:18.66666603px;writing-mode:lr-tb;stroke-width:0.99999994">bridge + dpdk + style="display:inline" + sodipodi:insensitive="true"> + + + + + id="g9842-9" + transform="matrix(-1,0,0,1,1148.9726,96.615258)"> + id="path8471-3-2-5-7-2-9" + d="M 713.63739,-8.0163969 838.31673,33.050084" + style="display:inline;fill:none;stroke:#000000;stroke-width:1.89580917;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + uCPE Device 1 + + + + + + + + Clavister + 192.168.10.1 + 192.168.20.1 + - - + id="g224"> + Legend: - Connection via cloud/internet:- Back to Back: BTB- Flow rules: + id="tspan890-2-5" + x="-121.59303" + y="293.63873" + style="font-size:18.66666603px;writing-mode:lr-tb;stroke-width:0.99999994">bridge + dpdk diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png index 11689c6..d6a8d57 100755 Binary files a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png and b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png differ diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.svg index 19d70d3..40cbd93 100755 --- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.svg +++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.svg @@ -7,16 +7,20 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="238.40312mm" - height="130.64748mm" - viewBox="0 0 238.40312 130.64748" + height="130.7467mm" + viewBox="0 0 238.40312 130.74671" version="1.1" id="svg8" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - sodipodi:docname="uc_clavister_sriov.svg" - style="enable-background:new"> + sodipodi:docname="uc_clavister_sriov_new.svg" + style="enable-background:new" + inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_clavister_sriov_new.png" + inkscape:export-xdpi="63.925339" + inkscape:export-ydpi="63.925339"> + + + + + + + + + + + + + id="filter4332-4-5"> + id="feBlend4334-1" /> @@ -449,13 +513,13 @@ orient="auto" refY="0" refX="0" - id="marker7435-1-4-4-6" + id="marker7435-1" style="overflow:visible" inkscape:isstock="true"> @@ -467,15 +531,15 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.1486984" - inkscape:cx="431.73338" - inkscape:cy="238.25707" + inkscape:zoom="0.81225243" + inkscape:cx="514.32224" + inkscape:cy="255.43341" inkscape:document-units="mm" inkscape:current-layer="layer10" showgrid="false" inkscape:showpageshadow="false" - inkscape:window-width="1858" - inkscape:window-height="1177" + inkscape:window-width="1366" + inkscape:window-height="713" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" @@ -484,8 +548,36 @@ fit-margin-right="0" fit-margin-bottom="0" inkscape:pagecheckerboard="false" - showborder="true" - width="300mm" /> + showborder="false" + width="300mm" + showguides="true" + inkscape:guide-bbox="true"> + + + + + + @@ -494,53 +586,178 @@ image/svg+xml - + + + + + + + + Legend: - Connection via cloud/internet:- VPN/Back to Back (BTB):- Flow rules: + + + + + + + + + + transform="translate(-1.4413696,-10.665035)"> + id="g2253"> + d="m 123.55397,85.3231 a 10.213003,8.6845435 0 0 0 -6.68017,2.12972 7.3267194,4.8471871 0 0 0 -1.53463,-0.11005 7.3267194,4.8471871 0 0 0 -6.28296,2.36481 10.172598,7.1157176 0 0 0 -1.00344,-0.0351 10.172598,7.1157176 0 0 0 -10.172677,7.11576 10.172598,7.1157176 0 0 0 2.747957,4.85586 5.1065016,3.4334242 0 0 0 -0.16435,0.84612 5.1065016,3.4334242 0 0 0 5.1065,3.43343 5.1065016,3.4334242 0 0 0 1.79049,-0.21972 4.662458,5.6550516 0 0 0 3.09399,1.43152 4.662458,5.6550516 0 0 0 2.64388,-1.00471 8.4368287,6.0589839 0 0 0 6.01497,1.81257 8.4368287,6.0589839 0 0 0 6.52493,-2.22359 12.433222,5.0491531 0 0 0 5.9083,0.60786 12.433222,5.0491531 0 0 0 12.43322,-5.04915 12.433222,5.0491531 0 0 0 -0.73936,-1.70053 9.6231236,5.6550516 0 0 0 3.11178,-4.15649 9.6231236,5.6550516 0 0 0 -9.62282,-5.65505 9.6231236,5.6550516 0 0 0 -3.96431,0.50965 10.213003,8.6845435 0 0 0 -9.2113,-4.9529 z" + style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.19981423;stroke-opacity:1;filter:url(#filter4332)" /> Internet + id="g1346"> - + + + uCPE Manager @@ -612,25 +829,13 @@ d="m 166.33095,174.51457 h -20.4778" id="path8471-0" inkscape:connector-curvature="0" /> - BTB + transform="translate(-1.4413696,-10.665035)"> + + uCPE Device2 - - uCPE Device2 + id="g2338" + transform="translate(0,-1.5875)"> + + + + - - - - - + id="path7023-9" + d="m 170.40453,35.416576 -9.70428,-0.0571" + style="display:inline;fill:#777777;fill-opacity:1;stroke:#777777;stroke-width:0.24164599px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker7435-0-2);enable-background:new" /> + + + Iperf server + 192.168.10.10 + + - - - - Iperf client - - Iperf server - 192.168.20.20 - 192.168.10.10 - - SR-IOV + id="rect5985-3-6" + style="fill:#ffffff;stroke:#320000;stroke-width:0.37;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + SR-IOV + + Iperf client + 192.168.20.20 + transform="translate(-1.4413696,-10.665035)"> + + uCPE Device1 + + + SR-IOV + style="stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none" + id="g1209" + transform="translate(0.52916667)"> - uCPE Device1 - - - SR-IOV - - - - - + ry="0" + rx="0.63716644" + y="29.874964" + x="95.311531" + height="38.091103" + width="7.3845434" + id="rect5985" + style="fill:#ffffff;stroke:#320000;stroke-width:0.37;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - - - - - + + + + + + + + Clavister - Clavister + 192.168.10.1 - 192.168.10.1 + 192.168.20.1 - - - - - - - - - - - Legend: - Connection via cloud/internet:- Back to Back: BTB- Flow rules: - + x="77.112869" + id="tspan11489-3" + sodipodi:role="line">192.168.20.1 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 index 4209a0a..48ff9cc 100755 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 867b2b7..8e692f2 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 @@ -17,12 +17,40 @@ id="svg8" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="uc_enea_test_vnf.svg" - inkscape:export-filename="Z:\uc_enea_test_vnf.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96" + inkscape:export-filename="X:\images\uc_enea_test_vnf.png" + inkscape:export-xdpi="65.025185" + inkscape:export-ydpi="65.025185" style="enable-background:new"> + + + + + + image/svg+xml - + @@ -637,31 +665,29 @@ id="tspan6009-5" sodipodi:role="line">Internet - - - BTB - + + BTB + transform="translate(43.000002,-286.11663)" + sodipodi:insensitive="true"> + transform="translate(43.000002,-286.11663)" + sodipodi:insensitive="true"> @@ -909,68 +936,68 @@ id="layer12" inkscape:label="Legend" style="filter:url(#filter6631)" - transform="translate(43.000002,-286.11663)"> + transform="translate(43.000002,-286.11663)" + sodipodi:insensitive="true"> + id="g1447"> + - - - - + + + Legend: - Connection via cloud/internet:- Back to Back: BTB- Flow rules: - + x="-0.59244788" + sodipodi:role="line">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 index 9e32573..fe18850 100755 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 980ced1..191ec5e 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 @@ -9,14 +9,17 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="245.05228mm" - height="83.061554mm" - viewBox="0 0 245.05228 83.061554" + width="210.00377mm" + height="81.219772mm" + viewBox="0 0 210.00378 81.219772" version="1.1" id="svg8" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - sodipodi:docname="uc_fortigate_fw.svg" - style="enable-background:new"> + sodipodi:docname="uc_fortigate_fw_new.svg" + style="enable-background:new" + inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_fortigate_fw_new.png" + inkscape:export-xdpi="62.189999" + inkscape:export-ydpi="62.189999"> - - - + id="filter4332"> + id="feBlend4334" /> + showguides="true" + inkscape:guide-bbox="true" /> @@ -466,191 +460,61 @@ image/svg+xml - + - Test - - Internet + id="g1759" + transform="translate(22.124598,-1.1458096)"> + transform="matrix(0.81480178,0,0,0.62159753,-4.0452924,4.8643852)" + id="g6108-0" + style="fill:#ac9d93"> uCPE Manager - - - - - - - - - - - - - - - Test Machine - + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;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.26458332" + y="45.066971" + x="6.3358655" + id="tspan4178" + sodipodi:role="line">Test Machine - + style="stroke-width:0.26458332" /> + + + uCPE Device + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;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.26458332" + y="49.513149" + x="150.1429" + id="tspan263-9" + sodipodi:role="line">dpdk - + transform="matrix(0.26458333,0,0,0.26458333,-13.632398,2.5553132)" + id="g2099"> - - - - - FortigateFirewall - - - - - - - - - - - - - wan_br - - + style="display:inline;fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.4464258;stroke-opacity:1" + id="rect6098-9-2-8-5" + width="69.460823" + height="40.985825" + x="619.80499" + y="126.25166" + rx="9.5899591" + ry="9.7688789" /> dpdk + id="tspan890-2-1-9" + x="654.4104" + y="150.88129" + 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:0.99999994">wan_br + + + + dpdk - - - - lan2_br - - + transform="translate(2.2457483,1.6699154)" + id="g1561"> + dpdk + id="tspan890-2-0-9" + x="62.570286" + y="88.203476" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;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.26458332">lan1_br + + + + dpdk - - - lan1_br - + id="g1566"> + dpdk + id="tspan890-2-0-9-9" + x="85.373268" + y="89.924515" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;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.26458332">lan2_br + + Fortigate + + + uCPE Device - - Legend: - Connection via cloud/internet: + + + y="284.13779" + id="text4338" + transform="matrix(0.50317032,0,0,0.50317032,596.72244,344.04651)">Legend: - Connection via cloud/internet: + + + + + + + + Test + + + + + + + Internet + uCPEManager 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 index 15c63c8..acc3e53 100755 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 b1da213..ff65f57 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 @@ -12,14 +12,14 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="svg2" - width="1468.1787" - height="376.69196" - viewBox="0 0 1468.1787 376.69196" - sodipodi:docname="uc_fortigate_sdwan.svg" + width="830.0929" + height="482.41965" + viewBox="0 0 830.09292 482.41966" + sodipodi:docname="uc_fortigate_sdwan_new.svg" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - inkscape:export-filename="L:\docu_work\el_releases-nfv-access\doc\book-enea-nfv-access-example-usecases\doc\images\clavister_vnf_diagram.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96"> + inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_fortigate_sdwan_new.png" + inkscape:export-xdpi="65.519997" + inkscape:export-ydpi="65.519997"> @@ -430,17 +430,17 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1858" - inkscape:window-height="1177" + inkscape:window-width="1618" + inkscape:window-height="1027" id="namedview4" showgrid="false" - inkscape:zoom="1.000373" - inkscape:cx="696.21446" - inkscape:cy="208.0109" - inkscape:window-x="-8" + inkscape:zoom="1.0074671" + inkscape:cx="428.14055" + inkscape:cy="175.87748" + inkscape:window-x="1358" inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="layer4" + inkscape:current-layer="layer5" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" @@ -448,12 +448,12 @@ showguides="true" inkscape:guide-bbox="true" inkscape:showpageshadow="false" - showborder="true" /> + showborder="false" /> + id="flowRoot2130" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;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;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none" + transform="matrix(0.89433392,0,0,0.88309463,-86.050427,-35.503783)">uCPEManager + transform="translate(-206.89353,53.60331)" + style="display:inline"> + y="221.1394" /> + uCPE Device 2 + + + + + + + + + + + + + + id="g9810-2" + transform="matrix(0,1,1,0,896.18037,-508.90109)"> + + + + id="g1507"> + uCPE Device 2 + id="tspan890-2-0-4" + x="825.0979" + y="85.985962" + 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:0.99999994">vnfmgmt_br + + dpdk + + + + Fortigate + + + + - - - - - - - - - - - - - - - - - - Fortigate - - - - - - - - lan_br - - dpdk - - - - - lan_br - - dpdk - - - - - vnfmgmt_br - - dpdk - + ry="9.5899591" + style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.44231871;stroke-opacity:1" + id="rect6098-9-0-8-7" + width="69.460823" + height="40.235157" + x="-856.21503" + y="-3.7047772" + rx="9.5899591" + transform="scale(-1,1)" /> + lan_br + + dpdk + + + dpdk + + + lan_br @@ -1101,396 +1062,426 @@ id="layer7" inkscape:label="Test Machines" style="display:inline" - sodipodi:insensitive="true"> + transform="translate(-314.7295,-31.73299)"> + + + + id="g1510" + transform="translate(6.0325804)"> + rx="6.0006089" + ry="6.0006089" /> Test Machine + transform="translate(-654.04458)" + style="display:inline" + id="g1510-8"> + rx="6.0006089" + ry="6.0006089" /> Test Machine - - + transform="translate(-23.865391,-45.497822)" + style="display:inline"> + + + id="g9810-0-9-7-1" + transform="translate(-407.60381,186.71389)"> - - - - - - - - - - - uCPE Device 1 - - + rx="1.8328245" + y="31.997553" + x="704.77173" + height="40.698528" + width="16.687834" + id="rect5977-9-8-7-1-6-5" + style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + ry="1.8328245" /> + + + + + uCPE Device 1 + + + + + + + + transform="translate(-3.3059349,7.7197473)" + id="g1576"> + style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.44231871;stroke-opacity:1" + id="rect6098-9-0-8" + width="69.460823" + height="40.235157" + x="205.83028" + y="95.396355" + rx="9.5899591" + ry="9.5899591" /> Fortigate - - - + id="tspan890-2-1-5" + x="240.43568" + y="119.65066" + 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:0.99999994">wan_br + dpdk + + + id="g1625"> - - - - - vnfmgmt_br - + style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.4464258;stroke-opacity:1" + id="rect6098-9-2" + width="69.460823" + height="40.985825" + x="78.787758" + y="228.78468" + rx="9.5899591" + ry="9.7688789" /> dpdk - - - - - wan_br - - dpdk + id="tspan890-2-0" + x="112.90489" + y="253.41431" + 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:0.99999994">lan_br + dpdk + + + - - - lan_br - + id="g1611"> + dpdk + id="tspan890-2-1" + x="237.05164" + y="185.0871" + 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:0.99999994">vnfmgmt_br + dpdk + + Fortigate + + + - - + + Legend: - Connection via cloud/internet: + 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)" + 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 index cf15d5b..d2527e5 100755 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 b376632..67e0250 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 @@ -11,14 +11,14 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="svg2" - width="954.96216" - height="460.8291" - viewBox="0 0 954.96213 460.8291" - sodipodi:docname="uc_vnf_chaining.svg" + width="960.42157" + height="482.07703" + viewBox="0 0 960.42155 482.07702" + sodipodi:docname="uc_vnf_chaining_new.svg" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - inkscape:export-filename="C:\Users\jaar\Desktop\NFV Documentation Figures\images\vnf_chaining_example.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96"> + inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_vnf_chaining_new.png" + inkscape:export-xdpi="60.310001" + inkscape:export-ydpi="60.310001"> @@ -33,21 +33,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="filter4332"> + id="feBlend4334" /> + showborder="false" /> -
- + \ No newline at end of file -- cgit v1.2.3-54-g00ecf