diff options
14 files changed, 61 insertions, 60 deletions
diff --git a/docs/guides/onap-user/abbreviations.rst b/docs/guides/onap-user/abbreviations.rst index 14644b6b8..89422fb38 100644 --- a/docs/guides/onap-user/abbreviations.rst +++ b/docs/guides/onap-user/abbreviations.rst @@ -337,11 +337,8 @@ Abbreviations | | pedia.org/wiki/Network_function | | | _virtualization>`__ | +------------------------------------+---------------------------------+ -| NFVI | `network functions | -| | virtualization | -| | infrastructure <https://www.sdx | -| | central.com/nfv/definitions/nfv | -| | -mano/>`__ | +| NFVI | Network Functions | +| | Virtualization Infrastructure | +------------------------------------+---------------------------------+ | NOD | Network On Demand | +------------------------------------+---------------------------------+ @@ -379,9 +376,7 @@ Abbreviations | OMSA | ONAP Microservice Architecture | +------------------------------------+---------------------------------+ | ONAP | `Open Network Automation | -| | Platform <https://wiki.onap.org | -| | /pages/viewpage.action?pageId=1 | -| | 015843>`__ | +| | Platform` | +------------------------------------+---------------------------------+ | OOF | ONAP Optimization Framework | +------------------------------------+---------------------------------+ @@ -394,9 +389,8 @@ Abbreviations +------------------------------------+---------------------------------+ | OpenStack | A cloud operating system | +------------------------------------+---------------------------------+ -| OPNFV | `Open Platform for NFV | -| | Project <https://www.sdxcentral | -| | .com/nfv/definitions/opnfv/>`__ | +| OPNFV | Open Platform for NFV | +| | Project | +------------------------------------+---------------------------------+ | Originato | MMSC Any Non-AT&T MMSC that | | | originally sent the request to | @@ -600,12 +594,7 @@ Abbreviations | | 3+Clean+Version+with+IFA011+v2. | | | 5.1>`__ | +------------------------------------+---------------------------------+ -| VES | `Virtual function | -| | EventStream <https://wiki.opnfv | -| | .org/download/attachments/68193 | -| | 29/OPNVF%20VES.pptx?version=4&m | -| | odificationDate=1466395653000&a | -| | pi=v2>`__ | +| VES | Virtual function EventStream | +------------------------------------+---------------------------------+ | vF | Virtual Firewall (an example | | | VNF) | diff --git a/docs/guides/onap-user/connect.rst b/docs/guides/onap-user/connect.rst index 6ae69bf10..c7bb341d9 100644 --- a/docs/guides/onap-user/connect.rst +++ b/docs/guides/onap-user/connect.rst @@ -34,7 +34,7 @@ required, it will be deleted once disconnected. By right-clicking on an element, an action menu opens. The menu allows to mount, unmount, view the details, edit and remove the element. Additionally, it links to several applications like -`Fault <pnfFault.html>`__ and `Configure <pnfConfig.html>`__, which will +:doc:`Fault <pnfFault>` and :doc:`Configure <pnfConfig>`, which will be filtered to display information relevant to the selected element. Connection Status Log diff --git a/docs/guides/onap-user/home.rst b/docs/guides/onap-user/home.rst index a756d8129..668db4d6a 100644 --- a/docs/guides/onap-user/home.rst +++ b/docs/guides/onap-user/home.rst @@ -14,7 +14,7 @@ microwave and millimeter wave radios, eNodeB, RRH, DAS equipment). | SDN-R is integrated into ONAP. Therefore it is interfacing with PNFs and VNFs and with other ONAP components, such as A&AI, DCAE and SO. -| `See abbreviations <abbreviations>`__ +| :doc:`See abbreviations <abbreviations>` .. figure:: ./ONAP-SDN-R.png :alt: SDN-R in ONAP diff --git a/docs/guides/onap-user/networkMap.rst b/docs/guides/onap-user/networkMap.rst index 6dc4fb946..5efc671a8 100644 --- a/docs/guides/onap-user/networkMap.rst +++ b/docs/guides/onap-user/networkMap.rst @@ -64,7 +64,7 @@ connect, configure, and fault. Currently, those buttons are disabled. By clicking on a link, the given link is loaded into details. If a link of type ‘microwave’ is selected, the ‘calculate link’ button -is available, which opens the `Link Calculator <linkCalculator.html>`__ +is available, which opens the :doc:`Link Calculator <linkCalculator>` in a new tab or page. Just like the map, the details panel updates the URL if data is loaded. diff --git a/docs/guides/onap-user/sdnr_Docker_Image_configuration.rst b/docs/guides/onap-user/sdnr_Docker_Image_configuration.rst index 5297a0944..7835fba5d 100644 --- a/docs/guides/onap-user/sdnr_Docker_Image_configuration.rst +++ b/docs/guides/onap-user/sdnr_Docker_Image_configuration.rst @@ -46,7 +46,7 @@ Different SDN-R services are using different parameter to be installed. | | | | | | | Devicemanager configuration is provided via *$ODL\_HOME/etc/devicemanager.properties* | | | | | -| | | See `SDN-R WT Service Configuration parameters <sdnr_WT_Service_Configuration_parameters.html>`__ | +| | | See :doc:`SDN-R WT Service Configuration parameters <sdnr_WT_Service_Configuration_parameters>` | +------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------+ | SDNRNORTHBOUND | true\|\ **false** | Set true to activate sdnr oofpci service. | +------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------+ diff --git a/docs/guides/onap-user/sdnr_WT_Service_Configuration_parameters.rst b/docs/guides/onap-user/sdnr_WT_Service_Configuration_parameters.rst index a27e5113f..767af4a54 100644 --- a/docs/guides/onap-user/sdnr_WT_Service_Configuration_parameters.rst +++ b/docs/guides/onap-user/sdnr_WT_Service_Configuration_parameters.rst @@ -14,7 +14,7 @@ same for each cluster node. - `devicemonitor <#SDN-RWTServiceConfigurationparameters-d>`__ Backgrounds regarding the container inter structure is described -in \ `SDN-R Docker Image configuration <sdnr_Docker_Image_configuration.html>`__. +in \ :doc:`SDN-R Docker Image configuration <sdnr_Docker_Image_configuration>`. The configuration information of sdnr wireless transport parameters are in a single file. diff --git a/docs/tox.ini b/docs/tox.ini index 7a8b6890e..8e5325ed1 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = docs, +envlist = docs,linkcheck skipsdist = true [testenv:docs] @@ -11,18 +11,15 @@ deps = -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html - echo "Generated docs available in {toxinidir}/_build/html" -whitelist_externals = - echo - git - sh [testenv:docs-linkcheck] basepython = python3.8 -#deps = -r{toxinidir}/requirements-docs.txt -commands = echo "Link Checking not enforced" -#commands = sphinx-build -b -W linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck -whitelist_externals = echo +deps = + -r{toxinidir}/requirements-docs.txt + -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master +commands = + sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck [testenv:docs-spellcheck] basepython = python3.8 diff --git a/sdnr/wt/apigateway/provider/pom.xml b/sdnr/wt/apigateway/provider/pom.xml index 1a682eb67..6c69cd7dd 100644 --- a/sdnr/wt/apigateway/provider/pom.xml +++ b/sdnr/wt/apigateway/provider/pom.xml @@ -69,6 +69,12 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.cmpn</artifactId> + <version>7.0.0</version> + <scope>compile</scope> + </dependency> </dependencies> <build> diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/EsServlet.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/EsServlet.java index f3871a5c4..e1a9ae0f8 100644 --- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/EsServlet.java +++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/EsServlet.java @@ -21,10 +21,17 @@ package org.onap.ccsdk.features.sdnr.wt.apigateway; import java.io.IOException; +import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName; +import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern; +@HttpWhiteboardServletPattern("/database/*") +@HttpWhiteboardServletName("EsServlet") +@Component(service = Servlet.class) public class EsServlet extends BaseServlet { private static final long serialVersionUID = -3996363343749995011L; diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/SitedocServlet.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/SitedocServlet.java index 347dbb0d3..d96ddb613 100644 --- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/SitedocServlet.java +++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/SitedocServlet.java @@ -21,10 +21,17 @@ package org.onap.ccsdk.features.sdnr.wt.apigateway; import java.io.IOException; +import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName; +import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern; +@HttpWhiteboardServletPattern("/sitedoc/*") +@HttpWhiteboardServletName("SitedocServlet") +@Component(service = Servlet.class) public class SitedocServlet extends BaseServlet { private static final long serialVersionUID = 5946205120796162644L; diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TerrainServlet.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TerrainServlet.java index 12954c647..5b5cc8ab9 100644 --- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TerrainServlet.java +++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TerrainServlet.java @@ -21,10 +21,17 @@ package org.onap.ccsdk.features.sdnr.wt.apigateway; import java.io.IOException; +import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName; +import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern; +@HttpWhiteboardServletPattern("/terrain/*") +@HttpWhiteboardServletName("TerrainServlet") +@Component(service = Servlet.class) public class TerrainServlet extends BaseServlet { private static final long serialVersionUID = 5946205120796162644L; diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TilesServlet.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TilesServlet.java index a29717a73..1978d7c6f 100644 --- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TilesServlet.java +++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TilesServlet.java @@ -21,10 +21,17 @@ package org.onap.ccsdk.features.sdnr.wt.apigateway; import java.io.IOException; +import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName; +import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern; +@HttpWhiteboardServletPattern("/tiles/*") +@HttpWhiteboardServletName("TilesServlet") +@Component(service = Servlet.class) public class TilesServlet extends BaseServlet { private static final long serialVersionUID = 5946205120796162644L; diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TopologyServlet.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TopologyServlet.java index 1a8187640..0350d966b 100644 --- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TopologyServlet.java +++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TopologyServlet.java @@ -21,10 +21,17 @@ package org.onap.ccsdk.features.sdnr.wt.apigateway; import java.io.IOException; +import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName; +import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern; +@HttpWhiteboardServletPattern("/topology/*") +@HttpWhiteboardServletName("TopologyServlet") +@Component(service = Servlet.class) public class TopologyServlet extends BaseServlet { private static final long serialVersionUID = 5946205120796162644L; diff --git a/sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml b/sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml index 37fa4ee9c..a6166b433 100644 --- a/sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml +++ b/sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml @@ -26,59 +26,33 @@ class="org.onap.ccsdk.features.sdnr.wt.apigateway.AaiServlet"> </bean> - <service interface="javax.servlet.http.HttpServlet" ref="aaiServlet"> - <service-properties> - <entry key="alias" value="/aai"/> - </service-properties> - </service> <bean id="esServlet" class="org.onap.ccsdk.features.sdnr.wt.apigateway.EsServlet"> </bean> - <service interface="javax.servlet.http.HttpServlet" ref="esServlet"> - <service-properties> - <entry key="alias" value="/database"/> - </service-properties> - </service> <bean id="tilesServlet" class="org.onap.ccsdk.features.sdnr.wt.apigateway.TilesServlet"> </bean> - <service interface="javax.servlet.http.HttpServlet" ref="tilesServlet"> - <service-properties> - <entry key="alias" value="/tiles"/> - </service-properties> - </service> <bean id="topologyServlet" class="org.onap.ccsdk.features.sdnr.wt.apigateway.TopologyServlet"> </bean> - <service interface="javax.servlet.http.HttpServlet" ref="topologyServlet"> - <service-properties> - <entry key="alias" value="/topology"/> - </service-properties> - </service> <bean id="sitedocServlet" class="org.onap.ccsdk.features.sdnr.wt.apigateway.SitedocServlet"> </bean> - <service interface="javax.servlet.http.HttpServlet" ref="sitedocServlet"> - <service-properties> - <entry key="alias" value="/sitedoc"/> - </service-properties> - </service> - <bean id="terrainServlet" class="org.onap.ccsdk.features.sdnr.wt.apigateway.TerrainServlet"> </bean> - <service interface="javax.servlet.http.HttpServlet" ref="terrainServlet"> + <!-- <service interface="javax.servlet.http.HttpServlet" ref="terrainServlet"> <service-properties> <entry key="alias" value="/terrain"/> </service-properties> - </service> + </service>--> </blueprint> |