diff options
author | Miruna Paun <Miruna.Paun@enea.com> | 2019-09-05 11:05:11 +0200 |
---|---|---|
committer | Miruna Paun <Miruna.Paun@enea.com> | 2019-09-05 11:08:29 +0200 |
commit | 695d365d92df8a2f76e2631f2cb0ab69957d3317 (patch) | |
tree | f65d1ec617919ba6bbb8fbe1bba3c8986405fdcf | |
parent | 7561f583d3143434dcf12f5e4255fc14570e67ab (diff) | |
download | el_releases-nfv-access-695d365d92df8a2f76e2631f2cb0ab69957d3317.tar.gz |
Replaced "VIM" with "uCPE device" in all docs where needed.
Synced version in CMC.
Change-Id: I35747b588c4edd7fbb6f7aef4462cbf1367d323a
5 files changed, 8 insertions, 15 deletions
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 2aea23d..ffdda0d 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 | |||
@@ -1635,7 +1635,7 @@ Options: | |||
1635 | -H HOST, --host=HOST Enea uCPE Manager host name or IP address | 1635 | -H HOST, --host=HOST Enea uCPE Manager host name or IP address |
1636 | -t VNFTYPE, --vnfType=VNFTYPE | 1636 | -t VNFTYPE, --vnfType=VNFTYPE |
1637 | VNF Type (Name of VNF descriptor) | 1637 | VNF Type (Name of VNF descriptor) |
1638 | -n VIMDEVICENAME, --device-name=VIMDEVICENAME | 1638 | -n DEVICENAME, --device-name=DEVICENAME |
1639 | Name of the device | 1639 | Name of the device |
1640 | -f PROPSFILE, --file=PROPSFILE | 1640 | -f PROPSFILE, --file=PROPSFILE |
1641 | File containing VNF instance properties in JSON format | 1641 | File containing VNF instance properties in JSON format |
@@ -1715,7 +1715,7 @@ Options: | |||
1715 | -H HOST, --host=HOST Enea uCPE Manager host name or IP address | 1715 | -H HOST, --host=HOST Enea uCPE Manager host name or IP address |
1716 | -i VNFINSTANCENAME, --vnfInstanceName=VNFINSTANCENAME | 1716 | -i VNFINSTANCENAME, --vnfInstanceName=VNFINSTANCENAME |
1717 | Name of VNF instance | 1717 | Name of VNF instance |
1718 | -n VIMDEVICENAME, --device-name=VIMDEVICENAME | 1718 | -n DEVICENAME, --device-name=DEVICENAME |
1719 | Name of the device | 1719 | Name of the device |
1720 | -c COMMAND, --command=COMMAND | 1720 | -c COMMAND, --command=COMMAND |
1721 | Control command (stop, start, pause or resume) | 1721 | Control command (stop, start, pause or resume) |
@@ -1799,7 +1799,7 @@ Options: | |||
1799 | -H HOST, --host=HOST Enea uCPE Manager host name or IP address | 1799 | -H HOST, --host=HOST Enea uCPE Manager host name or IP address |
1800 | -i VNFINSTANCENAME, --vnfInstanceName=VNFINSTANCENAME | 1800 | -i VNFINSTANCENAME, --vnfInstanceName=VNFINSTANCENAME |
1801 | Name of VNF instance | 1801 | Name of VNF instance |
1802 | -n VIMDEVICENAME, --device-name=VIMDEVICENAME | 1802 | -n DEVICENAME, --device-name=DEVICENAME |
1803 | Name of the device | 1803 | Name of the device |
1804 | 1804 | ||
1805 | Mandatory options: | 1805 | Mandatory options: |
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated.xml index bb969c6..f260584 100644 --- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated.xml +++ b/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated.xml | |||
@@ -42,7 +42,7 @@ export PATH=~/bin:$PATH</programlisting></para> | |||
42 | correct also compared to the "previous" REL VER in pardoc-distro.xml | 42 | correct also compared to the "previous" REL VER in pardoc-distro.xml |
43 | "prev_baseline".</bridgehead> | 43 | "prev_baseline".</bridgehead> |
44 | 44 | ||
45 | <para id="EneaLinux_REL_VER"><phrase>2.2.1</phrase></para> | 45 | <para id="EneaLinux_REL_VER"><phrase>2.2</phrase></para> |
46 | 46 | ||
47 | <para id="Yocto_VER"><phrase>2.1</phrase></para> | 47 | <para id="Yocto_VER"><phrase>2.1</phrase></para> |
48 | 48 | ||
diff --git a/doc/book-enea-nfv-access-getting-started/doc/definitions_and_acronyms.xml b/doc/book-enea-nfv-access-getting-started/doc/definitions_and_acronyms.xml index 38c71b8..f67cfe4 100644 --- a/doc/book-enea-nfv-access-getting-started/doc/definitions_and_acronyms.xml +++ b/doc/book-enea-nfv-access-getting-started/doc/definitions_and_acronyms.xml | |||
@@ -65,12 +65,6 @@ | |||
65 | <entry>OVS</entry> | 65 | <entry>OVS</entry> |
66 | <entry>Open vSwitch.</entry> | 66 | <entry>Open vSwitch.</entry> |
67 | </row> | 67 | </row> |
68 | |||
69 | <row> | ||
70 | <entry>VIM</entry> | ||
71 | |||
72 | <entry>Virtual Infrastructure Manager.</entry> | ||
73 | </row> | ||
74 | </tbody> | 68 | </tbody> |
75 | </tgroup> | 69 | </tgroup> |
76 | </table> | 70 | </table> |
diff --git a/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml b/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml index 6632834..a1ebf64 100644 --- a/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml +++ b/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml | |||
@@ -730,16 +730,15 @@ | |||
730 | </listitem> | 730 | </listitem> |
731 | 731 | ||
732 | <listitem> | 732 | <listitem> |
733 | <para><emphasis role="bold">VIM</emphasis>. The uCPE device on which | 733 | <para><emphasis role="bold">Device</emphasis>. The uCPE device on which |
734 | to instantiate a VNF, i.e. the uCPE device that will run this | 734 | to instantiate a VNF, i.e. the uCPE device that will run this |
735 | VNF.</para> | 735 | VNF.</para> |
736 | </listitem> | 736 | </listitem> |
737 | 737 | ||
738 | <listitem> | 738 | <listitem> |
739 | <para><emphasis role="bold">Auto-start</emphasis>. If checked, the | 739 | <para><emphasis role="bold">Auto-start</emphasis>. If checked, the |
740 | VNF will be stopped and started when unreachable. When the VIM | 740 | VNF will be stopped and started when unreachable. When the uCPE Device reports that it has lost connection to the VNF, the uCPE Manager |
741 | reports that it has lost connection to the VNF, the uCPE Manager | 741 | will ask it to terminate the VM and then start it up again. If |
742 | will ask the VIM to terminate the VM and then start it up again. If | ||
743 | unchecked, only a <literal>Disconnected</literal> notification will | 742 | unchecked, only a <literal>Disconnected</literal> notification will |
744 | appear in the uCPE Manager.</para> | 743 | appear in the uCPE Manager.</para> |
745 | </listitem> | 744 | </listitem> |
diff --git a/doc/book-enea-nfv-access-vnf-onboarding-guide/doc/instantiation.xml b/doc/book-enea-nfv-access-vnf-onboarding-guide/doc/instantiation.xml index b06395d..90ffb23 100644 --- a/doc/book-enea-nfv-access-vnf-onboarding-guide/doc/instantiation.xml +++ b/doc/book-enea-nfv-access-vnf-onboarding-guide/doc/instantiation.xml | |||
@@ -49,7 +49,7 @@ | |||
49 | </listitem> | 49 | </listitem> |
50 | 50 | ||
51 | <listitem> | 51 | <listitem> |
52 | <para>VIM (the uCPE device to instantiate the VNF on).</para> | 52 | <para>Device (the uCPE device to instantiate the VNF on).</para> |
53 | </listitem> | 53 | </listitem> |
54 | 54 | ||
55 | <listitem> | 55 | <listitem> |