fix missing whiteboard patterns
Issue-ID: CCSDK-3890
Change-Id: I8d127d9a8b97ed91fb74a9ee384d3b4d07c9e242
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
14 files changed:
| | pedia.org/wiki/Network_function |
| | _virtualization>`__ |
+------------------------------------+---------------------------------+
| | 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 |
+------------------------------------+---------------------------------+
+------------------------------------+---------------------------------+
| NOD | Network On Demand |
+------------------------------------+---------------------------------+
| OMSA | ONAP Microservice Architecture |
+------------------------------------+---------------------------------+
| ONAP | `Open Network Automation |
| OMSA | ONAP Microservice Architecture |
+------------------------------------+---------------------------------+
| ONAP | `Open Network Automation |
-| | Platform <https://wiki.onap.org |
-| | /pages/viewpage.action?pageId=1 |
-| | 015843>`__ |
+------------------------------------+---------------------------------+
| OOF | ONAP Optimization Framework |
+------------------------------------+---------------------------------+
+------------------------------------+---------------------------------+
| OOF | ONAP Optimization Framework |
+------------------------------------+---------------------------------+
+------------------------------------+---------------------------------+
| OpenStack | A cloud operating system |
+------------------------------------+---------------------------------+
+------------------------------------+---------------------------------+
| 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 |
+------------------------------------+---------------------------------+
| Originato | MMSC Any Non-AT&T MMSC that |
| | originally sent the request to |
| | 3+Clean+Version+with+IFA011+v2. |
| | 5.1>`__ |
+------------------------------------+---------------------------------+
| | 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) |
+------------------------------------+---------------------------------+
| vF | Virtual Firewall (an example |
| | VNF) |
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
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
be filtered to display information relevant to the selected element.
Connection Status Log
| 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.
| 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
.. figure:: ./ONAP-SDN-R.png
:alt: SDN-R in ONAP
clicking on a link, the given link is loaded into details.
If a link of type ‘microwave’ is selected, the ‘calculate link’ button
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.
in a new tab or page.
Just like the map, the details panel updates the URL if data is loaded.
| | | |
| | | Devicemanager configuration is provided via *$ODL\_HOME/etc/devicemanager.properties* |
| | | |
| | | |
| | | 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. |
+------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------+
+------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------+
| SDNRNORTHBOUND | true\|\ **false** | Set true to activate sdnr oofpci service. |
+------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------+
- `devicemonitor <#SDN-RWTServiceConfigurationparameters-d>`__
Backgrounds regarding the container inter structure is described
- `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.
The configuration information of sdnr wireless transport parameters are
in a single file.
+envlist = docs,linkcheck
skipsdist = true
[testenv:docs]
skipsdist = true
[testenv:docs]
-chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
commands =
sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
-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
[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
[testenv:docs-spellcheck]
basepython = python3.8
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<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>
package org.onap.ccsdk.features.sdnr.wt.apigateway;
import java.io.IOException;
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 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;
public class EsServlet extends BaseServlet {
private static final long serialVersionUID = -3996363343749995011L;
package org.onap.ccsdk.features.sdnr.wt.apigateway;
import java.io.IOException;
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 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;
public class SitedocServlet extends BaseServlet {
private static final long serialVersionUID = 5946205120796162644L;
package org.onap.ccsdk.features.sdnr.wt.apigateway;
import java.io.IOException;
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 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;
public class TerrainServlet extends BaseServlet {
private static final long serialVersionUID = 5946205120796162644L;
package org.onap.ccsdk.features.sdnr.wt.apigateway;
import java.io.IOException;
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 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;
public class TilesServlet extends BaseServlet {
private static final long serialVersionUID = 5946205120796162644L;
package org.onap.ccsdk.features.sdnr.wt.apigateway;
import java.io.IOException;
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 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;
public class TopologyServlet extends BaseServlet {
private static final long serialVersionUID = 5946205120796162644L;
class="org.onap.ccsdk.features.sdnr.wt.apigateway.AaiServlet">
</bean>
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>
<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>
<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>
<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>
<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>
<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-properties>
<entry key="alias" value="/terrain"/>
</service-properties>
Code Review / ccsdk / features.git / commitdiff