[MSB]remove duplicated docs 99/127399/3
authorjinquanni <ni.jinquan@zte.com.cn>
Tue, 1 Mar 2022 12:43:06 +0000 (20:43 +0800)
committerjinquanni <ni.jinquan@zte.com.cn>
Tue, 1 Mar 2022 15:53:12 +0000 (23:53 +0800)
remove duplicated docs in msb/apigateway repo and update sphinx config files
Issue-ID: MSB-633

Signed-off-by: jinquanni <ni.jinquan@zte.com.cn>
Change-Id: I8ae19dc9cdceceb34184851320d0018edd92168d

29 files changed:
docs/_static/css/ribbon.css [moved from docs/docs/_static/css/ribbon.css with 100% similarity]
docs/_static/favicon.ico [moved from docs/docs/_static/favicon.ico with 100% similarity]
docs/_static/logo_onap_2017.png [moved from docs/docs/_static/logo_onap_2017.png with 100% similarity]
docs/conf.py [moved from docs/docs/conf.py with 100% similarity]
docs/conf.yaml [moved from docs/docs/conf.yaml with 100% similarity]
docs/docs/.gitignore [deleted file]
docs/docs/index.rst [deleted file]
docs/docs/platform/architecture.rst [deleted file]
docs/docs/platform/configuration.rst [deleted file]
docs/docs/platform/consumedapis.rst [deleted file]
docs/docs/platform/delivery.rst [deleted file]
docs/docs/platform/human-interfaces.rst [deleted file]
docs/docs/platform/images/add-host.png [deleted file]
docs/docs/platform/images/home.png [deleted file]
docs/docs/platform/images/msb-architecture.png [deleted file]
docs/docs/platform/images/service-detail.png [deleted file]
docs/docs/platform/images/service-edit.png [deleted file]
docs/docs/platform/images/service-list-2.png [deleted file]
docs/docs/platform/images/service-list.png [deleted file]
docs/docs/platform/images/service-register.png [deleted file]
docs/docs/platform/index.rst [deleted file]
docs/docs/platform/installation.rst [deleted file]
docs/docs/platform/log-and-diagnostic-info.rst [deleted file]
docs/docs/platform/offeredapis.rst [deleted file]
docs/docs/platform/user-guide.rst [deleted file]
docs/docs/release-notes.rst [deleted file]
docs/docs/requirements-docs.txt [deleted file]
docs/requirements-docs.txt [deleted file]
tox.ini [moved from docs/tox.ini with 55% similarity]

similarity index 100%
rename from docs/docs/conf.py
rename to docs/conf.py
similarity index 100%
rename from docs/docs/conf.yaml
rename to docs/conf.yaml
diff --git a/docs/docs/.gitignore b/docs/docs/.gitignore
deleted file mode 100644 (file)
index 43ca5b6..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/.tox
-/_build/*
-/__pycache__/*
diff --git a/docs/docs/index.rst b/docs/docs/index.rst
deleted file mode 100644 (file)
index e17778e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. _master_index:
-
-MSB(Microservices Bus)
-------------------------------------------------
-
-Microservices Bus(MSB) provides a reliable, resilient and scalable communication and governance infrastructure to support ONAP Microservice Architecture including service registration/discovery, external API gateway, internal API gateway, client SDK, Swagger SDK, etc. It's a pluggable architecture, plugins can be added to MSB to provide whatever functionalities you need, such as an auth plugin can be used to provide centralized authentication & authorization. MSB also provides a service portal to manage the REST APIs.
-
-MSB is platform independent, while it is integrated with Kubernetes(OOM) to provide transparent service registration for ONAP microservices, MSB also supports OpenStack(Heat) and bare metal deployment.
-
-This document is aimed to give the users some brief introductions on MSB from different aspects. The users could find useful information, e.g. the architecuture, the APIs and the installation steps, etc. as well as the release notes of MSB in this document.
-
-
-.. toctree::
-   :maxdepth: 1
-   
-   platform/index.rst
-   release-notes.rst
-
diff --git a/docs/docs/platform/architecture.rst b/docs/docs/platform/architecture.rst
deleted file mode 100644 (file)
index 090536c..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. _architecture:
-
-
-Architecture
-------------
-Microservices Bus(MSB) provides a reliable, resilient and scalable communication and governance infrastructure to support ONAP Microservice Architecture including service registration/discovery, external API gateway, internal API gateway, client SDK, Swagger SDK, etc. It's a pluggable architecture, plugins can be added to MSB to provide whatever functionalities you need, such as an auth plugin can be used to provide centralized authentication & authorization. MSB also provides a service portal to manage the REST APIs.
-
-MSB is platform independent, while it is integrated with Kubernetes(OOM) to provide transparent service registration for ONAP microservices, MSB also supports OpenStack(Heat) and bare metal deployment.
-
-
-
-MSB is mainly comprised of three parts: Discovery, API Gateway and MSB Client SDK. MSB also provide a swagger SDK which could generate swagger REST service description files..
-
-.. image:: images/msb-architecture.png
-
-Registry is the storage of service information, MSB leverage Consul as the service registry.
-
-MSB Discovery provides REST APIs for service discovery and registration.
-
-API Gateway provides service request routing, load balancing and service governance. It can be deployed as external Gateway or Internal Gateway.
-
-MSB SDK is a client-side Java SDK which can be used for point to point communication of microservices.
diff --git a/docs/docs/platform/configuration.rst b/docs/docs/platform/configuration.rst
deleted file mode 100644 (file)
index f0638d4..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-
-
-Configuration
--------------
-
-No machanism for customized configurtions is provided in this release. Such functionalities will be provided in the future if necessary.
-
diff --git a/docs/docs/platform/consumedapis.rst b/docs/docs/platform/consumedapis.rst
deleted file mode 100644 (file)
index a5700b2..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-
-Consumed APIs
--------------
-
-In the Amsterdam release, MSB does not consume any APIs provided by other ONAP components.
diff --git a/docs/docs/platform/delivery.rst b/docs/docs/platform/delivery.rst
deleted file mode 100644 (file)
index c289770..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-
-
-Delivery
---------
-
-Describe how functions are packaged into run-time components. For some components a block diagram may be useful.
-
-:Docker:
-
-- MSB Discovery
-- MSB API Gateway
-
-Docker containers can be downloaded from ONAP docker repository.
-
-:jar:
-
-- MSB Client SDK
-- Swagger SDK
-
-Jars can be downloaded from ONAP docker repository.
diff --git a/docs/docs/platform/human-interfaces.rst b/docs/docs/platform/human-interfaces.rst
deleted file mode 100644 (file)
index 70d2e03..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-
-Human Interfaces
-----------------
-MSB provides a Web GUI Portal for users.
-Users can register services and browse all the registered services. If the registered service support swagger, user can see the REST API documentation and test the registered services via the swagger UI integrated in MSB.
-
-Target Users
-^^^^^^^^^^^^
-ONAP Administrator.
-
-Interface Type
-^^^^^^^^^^^^^^
-Web GUI.
-
-Access
-^^^^^^
-``http://MSB_API_GATEWAY_IP:80/msb``
\ No newline at end of file
diff --git a/docs/docs/platform/images/add-host.png b/docs/docs/platform/images/add-host.png
deleted file mode 100644 (file)
index 7c23852..0000000
Binary files a/docs/docs/platform/images/add-host.png and /dev/null differ
diff --git a/docs/docs/platform/images/home.png b/docs/docs/platform/images/home.png
deleted file mode 100644 (file)
index e9db9c1..0000000
Binary files a/docs/docs/platform/images/home.png and /dev/null differ
diff --git a/docs/docs/platform/images/msb-architecture.png b/docs/docs/platform/images/msb-architecture.png
deleted file mode 100644 (file)
index 8485372..0000000
Binary files a/docs/docs/platform/images/msb-architecture.png and /dev/null differ
diff --git a/docs/docs/platform/images/service-detail.png b/docs/docs/platform/images/service-detail.png
deleted file mode 100644 (file)
index e546b7b..0000000
Binary files a/docs/docs/platform/images/service-detail.png and /dev/null differ
diff --git a/docs/docs/platform/images/service-edit.png b/docs/docs/platform/images/service-edit.png
deleted file mode 100644 (file)
index 2dbfade..0000000
Binary files a/docs/docs/platform/images/service-edit.png and /dev/null differ
diff --git a/docs/docs/platform/images/service-list-2.png b/docs/docs/platform/images/service-list-2.png
deleted file mode 100644 (file)
index f88b493..0000000
Binary files a/docs/docs/platform/images/service-list-2.png and /dev/null differ
diff --git a/docs/docs/platform/images/service-list.png b/docs/docs/platform/images/service-list.png
deleted file mode 100644 (file)
index bca9af3..0000000
Binary files a/docs/docs/platform/images/service-list.png and /dev/null differ
diff --git a/docs/docs/platform/images/service-register.png b/docs/docs/platform/images/service-register.png
deleted file mode 100644 (file)
index 745a100..0000000
Binary files a/docs/docs/platform/images/service-register.png and /dev/null differ
diff --git a/docs/docs/platform/index.rst b/docs/docs/platform/index.rst
deleted file mode 100644 (file)
index e918128..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-
-Platform
---------
-
-Microservices Bus provide key infrastructure functionalities to support ONAP microservice architecture including service registration/discovery, service gateway, service load balancer and service governance. It's a pluggable architecture so it can be extended with plugins to provide value added services such as centralized authentication for APIs. Microservices Platform also provides a GUI portal for service management.
-
-.. toctree::
-   :maxdepth: 1
-   
-   architecture.rst
-   offeredapis.rst
-   consumedapis.rst
-   delivery.rst
-   log-and-diagnostic-info.rst
-   installation.rst
-   configuration.rst
-   human-interfaces.rst
-   user-guide.rst
diff --git a/docs/docs/platform/installation.rst b/docs/docs/platform/installation.rst
deleted file mode 100644 (file)
index da8af18..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-
-Installation
-------------
-MSB can run as docker, it's very handy to try it at your laptop. For production, MSB supports to be deployed as a cluster to provide a scalable microservice communication infrastructure with kubernetes.
-Run MSB on the a single host using host network
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This deployment approach is only for testing. MSB is consist of multiple microservices, for testing, the easiest way is to run them in the same host by using host network.  
-
-- Run the Consul dockers
-
-::
-
-  sudo docker run -d --net=host --name msb_consul consul:0.9.3
-
-- Run the MSB dockers
-
-Login the ONAP docker registry first: 
-
-::
-
-  docker login -u docker -p docker nexus3.onap.org:10001
-
-Run MSB dockers
-
-::
-
-  docker run -d --net=host --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery
-  docker run -d --net=host -e "ROUTE_LABELS=visualRange:1" --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
-
-- Register your REST service to MSB via curl
-
-For testing, we can register the services via curl. 
-
-::
-
-    curl -X POST \
-    -H "Content-Type: application/json" \
-    -d '{"serviceName": "aai", "version": "v8", "url": "/aai/v8","protocol": "REST", "path": "/aai/v8", "nodes": [ {"ip": "10.74.215.65","port": "8443"}]}' \
-    "http://127.0.0.1:10081/api/microservices/v1/services”
-
-- Access the rest service via api gateway
-
-::
-
-    curl http://127.0.0.1/api/aai/v8/cloud-infrastructure/cloud-regions
-
-- Browse the registered services
-
-  Open MSB Web GUI portal in your browser: ``http://127.0.0.1/msb`` , you can see all the registered services. If the registered service support swagger, you can see the REST API documentation and test the registered services via the swagger UI integrated in MSB.
-
-Run MSB using default docker network
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In case that you don't want to use host network to set up the MSB dockers, you need to export the port and specify the environment variables to let msb components know each other.
-
-- Run the Consul dockers
-
-::
-
-    sudo docker run -d -p 8500:8500  --name msb_consul consul:0.9.3
-    CONSUL_IP=`sudo docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' msb_consul`
-
-
-- Run the MSB dockers
-
-Login the ONAP docker registry first: 
-
-::
-
-  docker login -u docker -p docker nexus3.onap.org:10001
-
-Run MSB dockers
-
-::
-
-  sudo docker run -d  -p 10081:10081  -e CONSUL_IP=$CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery
-  DISCOVERY_IP=`sudo docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' msb_discovery`
-  sudo docker run -d -p 80:80 -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP -e "ROUTE_LABELS=visualRange:1" --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
-
-Deploy MSB with kubernetes
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The chart for MSB running in kubernetes cluster is available here: 
-
-https://gerrit.onap.org/r/gitweb?p=oom.git;a=tree;f=kubernetes/msb;h=17f8fd89791b81f1e981716dcffdb3e2e90299ae;hb=refs/heads/master
diff --git a/docs/docs/platform/log-and-diagnostic-info.rst b/docs/docs/platform/log-and-diagnostic-info.rst
deleted file mode 100644 (file)
index bcabd73..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-
-Logging & Diagnostic Information
----------------------------------
-
-Description of how to interact with and diagnose problems with the components as delivered.
-
-Where to Access Information
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-You can use docker command such as docker exec or docker logs to interact with and diagnose problems of MSB.
-
-
-Error / Warning Messages
-^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/docs/platform/offeredapis.rst b/docs/docs/platform/offeredapis.rst
deleted file mode 100644 (file)
index 3f74821..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Offered APIs
-------------
-.. _offeredapis:
-
-The MSB provides the following APIs.
-
-- `Service Registration <https://wiki.onap.org/display/DW/Microservice+Bus+API+Documentation#MicroserviceBusAPIDocumentation-RegisterservicetotheMicroserviceBus>`_.
-- `Service Unregistration <https://wiki.onap.org/display/DW/Microservice+Bus+API+Documentation#MicroserviceBusAPIDocumentation-UnregisterservicefromtheMicroserviceBus>`_.
-- `Service Discovery <https://wiki.onap.org/display/DW/Microservice+Bus+API+Documentation#MicroserviceBusAPIDocumentation-QueryservicefromtheMicroserviceBus>`_.
-- `MSB Java SDK :ref: https://wiki.onap.org/display/DW/Microservice+Bus+API+Documentation#MicroserviceBusAPIDocumentation-MSBClientSDK>`.
-- `Swagger SDK <https://wiki.onap.org/display/DW/swagger-sdk>`_.
-
-Discover more about.
-
-- `MSB API & User Guide <https://wiki.onap.org/pages/viewpage.action?pageId=20873883>`_.
diff --git a/docs/docs/platform/user-guide.rst b/docs/docs/platform/user-guide.rst
deleted file mode 100644 (file)
index a897794..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0
-   International License.
-.. http://creativecommons.org/licenses/by/4.0
-
-MSB User-guide
-==============
-
-
-Overview
---------
-
-Micro-Service Bus (MSB) provides a facility to register and
-expose ONAP Rest API.
-
-It is particulary usefull to expose some API endpoints
-that are not published by default when installing ONAP with OOM installer.
-
-There are two methods to register an API in MSB:
-
-- via MSB Portal/GUI
-- via MSB Rest API
-
-
-Using MSB portal
-----------------
-
-MSB Portal/GUI is available on the following URL
-(adapt to your ONAP installation)
-
-..
-
-    ``http://msb.api.discovery.simpledemo.onap.org:30282/iui/microservices/default.html``
-
-
-The following screen should appears
-
-.. figure:: images/home.png
-   :align: center
-
-
-click on the "Service Discover" icon to get the list of
-registred API (it will take several seconds to get the next screen)
-
-.. figure:: images/service-list-2.png
-   :align: center
-
-Note: majority of Registred API have been declared using MSB API and
-they can not be modified/deleted via MSB Portal/GUI.
-
-
-click on "view" icon in "Control" column to have a more
-detailed description of the registred API
-
-.. figure:: images/service-detail.png
-   :align: center
-
-click on "Service Register" icon to start the register process for a new API
-
-.. figure:: images/service-register.png
-   :align: center
-
-"Service Name" will be the new API name in MSB and will be used
-to build the URL that will be exposed.
-
-"Url" is the url of the existing ONAP API that we are registering
-
-"Protocol" must be selected in the list (usualy REST)
-
-"Version" will be part of the exposed URL
-
-"Visual Range" must be selected (usualy inSystem)
-
-click on "Add Host" to provide information about IP address and
-port of the API that we are registering.
-
-Tips: from an ONAP platform installed via OOM, to know about the IP/port,
-use Kubctl commands
-
-example: to know about IP addresses used by ONAP Policy components
-
-::
-
-    kubectl get svc -n onap | grep policy
-
-
-Here after an example of Registered API for ONAP SO:
-
-
-.. figure:: images/service-edit.png
-   :align: center
-
-
-
-Using MSB API
--------------
-
-Get the list of registred API in MSB
-
-
-::
-
-    curl -X GET \
-    http://msb.api.discovery.simpledemo.onap.org:30280/api/microservices/v1/services \
-    -H 'Content-Type: application/json' \
-    -H 'cache-control: no-cache'
-
-
-response (small extract only):
-
-::
-
-        ],
-        "metadata": [],
-        "labels": [],
-        "status": "1",
-        "is_manual": false
-    },
-    {
-        "serviceName": "aai-business",
-        "version": "v16",
-        "url": "/aai/v16/business",
-        "protocol": "REST",
-        "visualRange": "1",
-        "lb_policy": "ip_hash",
-        "publish_port": "",
-        "namespace": "",
-        "network_plane_type": "",
-        "host": "",
-        "path": "",
-        "enable_ssl": true,
-        "nodes": [
-            {
-                "ip": "10.233.69.5",
-                "port": "8447",
-                "checkType": "",
-                "checkUrl": "",
-                "tls_skip_verify": true,
-                "ha_role": "",
-                "nodeId": "_v16_aai-business_10.233.69.5_8447",
-                "status": "passing"
-            }
-        ],
-        "metadata": [],
-        "labels": [],
-        "status": "1",
-        "is_manual": false
-    },
-
-
-
-Register a new API (example for ONAP policy-pap API)
-
-"Service Name" will be the new API name in MSB and will be used
-to build the URL that will be exposed.
-
-"Url" is the url of the existing ONAP API that we are registering
-
-"Protocol" must be selected in the list (usualy REST)
-
-"Version" will be part of the exposed URL
-
-"Visual Range" must be selected (usualy inSystem)
-
-"enable_ssl" must be set to "true" is using
-https between MSB and API service that we are registering.
-
-"nodes" is a list  of IP addresses and port of the API that we are registering.
-
-Tips: from an ONAP platform installed via OOM, to know about the IP/port,
-use Kubctl commands
-"enable_ssl" must be set to "true" is using
-https between MSB and API service that we are registering.
-
-
-::
-
-    curl -X POST \
-    http://msb.api.discovery.simpledemo.onap.org:30280/api/microservices/v1/services \
-    -H 'Content-Type: application/json' \
-    -H 'cache-control: no-cache' \
-    -d '{
-    "serviceName": "policy-api",
-    "version": "v1",
-    "url": "/policy/api/v1",
-    "protocol": "REST",
-    "visualRange": "1",
-    "enable_ssl": true,
-    "nodes": [
-
-        {
-        "ip": "10.233.35.125",
-        "port": "6969",
-        "ttl": 0
-        }
-    ]
-    }
-    '
-
-Delete an API from MSB (=unregister an API):
-
-::
-
-    curl -X DELETE \
-    http://msb.api.discovery.simpledemo.onap.org:30280/api/microservices/v1/services/policy-pap/version/v1/nodes/10.233.15.213/6969 \
-    -H 'Content-Type: application/json' \
-    -H 'cache-control: no-cache' \
-    -d '{
-    "serviceName": "policy-pdp-legacy",
-    "version": "v1",
-    "url": "/pdp/api",
-    "protocol": "REST",
-    "visualRange": "1",
-    "enable_ssl": true,
-    "nodes": [
-
-        {
-        "ip": "10.233.77.14",
-        "port": "8081",
-        "ttl": 0
-        }
-    ]
-    }
-    '
-
-
-Using a registred API
----------------------
-
-
-Once registered, the API can then be accessible using
-the following URL/Port
-
-``http://msb.api.discovery.simpledemo.onap.org:30280/api/{{Service Name}}/{{Version}}/{{resource}}``
-
-where {{Service Name}} and {{Version}} are mapped to what have been registered
-
-{{resource}} is to be replace by the object that the API is able to manage
-
-
-some examples:
-
-to get the service model list from SDC via MSB
-(this API is pre-registred by default in ONAP):
-
-
-::
-
-    curl -X GET \
-    http://msb.api.discovery.simpledemo.onap.org:30280/api/sdc/v1/catalog/services \
-    -H 'Accept: application/json' \
-    -H 'Authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=' \
-    -H 'Content-Type: application/json' \
-    -H 'USER_ID: cs0008' \
-    -H 'X-FromAppId: ONAP-Test' \
-    -H 'X-TransactionId: ONAP-Test' \
-    -H 'cache-control: no-cache' \
-    -H 'x-ecomp-instanceid: ONAP-Test'
-
-
-
-to get the customer list from AAI via MSB
-(this API is pre-registred by default in ONAP):
-
-
-::
-
-    curl -X GET \
-    http://msb.api.discovery.simpledemo.onap.org:30280/api/aai-business/v16/customers \
-    -H 'Accept: application/json' \
-    -H 'Authorization: Basic QUFJOkFBSQ==' \
-    -H 'Content-Type: application/json' \
-    -H 'X-FromAppId: AAI' \
-    -H 'X-TransactionId: 808b54e3-e563-4144-a1b9-e24e2ed93d4f' \
-    -H 'cache-control: no-cache'
-
-
-to get the list of policy models from Policy via MSB
-(this policy API needs to be registred):
-
-::
-
-    curl -X GET \
-    http://msb.api.discovery.simpledemo.onap.org:30280/api/policy-api/v1/policytypes \
-    -H 'Authorization: Basic aGVhbHRoY2hlY2s6emIhWHp0RzM0' \
-    -H 'X-ONAP-RequestID: 9ac7ce8e-a867-4269-bc52-c8236b7fdad6' \
-    -H 'cache-control: no-cache'
diff --git a/docs/docs/release-notes.rst b/docs/docs/release-notes.rst
deleted file mode 100644 (file)
index 44c1733..0000000
+++ /dev/null
@@ -1,436 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. _release_notes:
-
-
-Microservices Bus(MSB) provides a reliable, resilient and scalable communication and governance infrastructure to support ONAP Microservice Architecture including service registration/discovery, external API gateway, internal API gateway, client SDK, Swagger SDK, etc. It's a pluggable architecture, plugins can be added to MSB to provide whatever functionalities you need, such as an auth plugin can be used to provide centralized authentication & authorization. MSB also provides a service portal to manage the REST APIs.
-
-MSB is platform independent, while it is integrated with Kubernetes(OOM) to provide transparent service registration for ONAP microservices, MSB also supports OpenStack(Heat) and bare metal deployment.
-
-Release Notes
-=============
-
-Version: 1.3.1 Istanbul Release
--------------------------------
-
-:Release Date: 2021-9-22
-
-**New Features**
-
-**Bug Fixes**
-
-**Fixed Security Issues**
-
-- MSB-593 PACKAGES UPGRADES IN DIRECT DEPENDENCIES FOR ISTANBUL
-- MSB-519 MSB has python 2.7 pods
-- MSB-520 MSB has java 8 pods
-- MSB-521 MSB certificates are too long and have bad owner
-
-**Known Issues**
-
-- MSB-534 kube2msb fails to register SO services including braces in url
-
-**Security Notes**
-
-The remaining issues are supposed to be fixed in the next release.
-
-Quick Links:
-        - `MSB project page for Istanbul Release <https://wiki.onap.org/display/DW/Microservices+Bus+Project>`_
-
-        - `Passing Badge information for MSB <https://bestpractices.coreinfrastructure.org/en/projects/1601>`_
-
-**Upgrade Notes**
-
-N/A
-
-**Deprecation Notes**
-
-Plain HTTP APIs have been removed from Frankfurt release, please use HTTPS instead.
-
-N/A
-
-**Other**
-
-N/A
-
-Version: 1.2.7 Guilin Release
-------------------------------
-
-:Release Date: 2020-11-19
-
-**New Features**
-
-**Bug Fixes**
-
-- MSB-539 Fix nginx say 10000 worker_connections are not enough
-- MSB-540 nginx in discovery deletes useless log printing
-- MSB-541 Discovery supports blocking monitoring time exceeding 10min
-
-**Fixed Security Issues**
-
-**Known Issues**
-
-- MSB-519 MSB has python 2.7 pods
-- MSB-520 MSB has java 8 pods
-- MSB-521 MSB certificates are too long and have bad owner
-- MSB-529 MSB dockers contain GPLv3
-
-**Security Notes**
-
-The remaining issues are supposed to be fixed in the next release.
-
-Quick Links:
-        - `MSB project page for Guilin Release <https://wiki.onap.org/display/DW/Microservices+Bus+Project>`_
-
-        - `Passing Badge information for MSB <https://bestpractices.coreinfrastructure.org/en/projects/1601>`_
-
-
-**Upgrade Notes**
-
-N/A
-
-**Deprecation Notes**
-
-Plain HTTP APIs have been removed from Frankfurt release, please use HTTPS instead.
-
-N/A
-
-**Other**
-
-N/A
-
-Version: 1.2.6 Frankfurt Release
---------------------------------
-
-:Release Date: 2020-May-07
-
-**New Features**
-
-**Bug Fixes**
-
-- MSB-470 Pairwise testing fails from Portal to MSB
-- MSB-468 MSB verification job is unstable
-- MSB-467 Certificate in MSB is set to use zte.com.cn
-- MSB-451 Code coverage data can't show at sonarcloud
-
-**Fixed Security Issues**
-
-- MSB-465 Update alpine to the latest version
-- MSB-462 Pods still run as root
-- MSB-418 Solve MSB vulnerability onap-msb-discovery-jackson-databind
-- MSB-417 Solve MSB vulnerability onap-msb-apigateway-jackson-databind
-- MSB-410 Solve MSB vulnerability onap-msb-java-sdk-jackson-databind
-- MSB-408 Solve MSB vulnerability onap-msb-java-sdk-commons-codec
-- MSB-407 Solve MSB vulnerability onap-msb-java-sdk-okhttp 
-- MSB-398 Remove plain HTTP Rest APIs
-- MSB-386 General sonar fixes
-
-**Known Issues**
-
-**Security Notes**
-
-MSB code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed.
-The remaining issues are identified as false positive and their risk assessment have been documented.
-
-Quick Links:
-        - `MSB project page for Frankfurt Release <https://wiki.onap.org/display/DW/Microservices+Bus+Project>`_
-
-        - `Passing Badge information for MSB <https://bestpractices.coreinfrastructure.org/en/projects/1601>`_
-
-**Upgrade Notes**
-
-N/A
-
-**Deprecation Notes**
-
-Plain HTTP APIs have been removed from Frankfurt release, please use HTTPS instead.
-
-N/A
-
-**Other**
-
-N/A
-
-Version: 1.2.5 EI-Alto Release
-------------------------------
-
-:Release Date: 2019-09-05
-
-**New Features**
-
-This release only contains a few bug fixes and small features.
-
-**New Features**
-
-- MSB-332 Delete custom services via the MSB management UI
-- MSB-151 Support registering HTTPS service on the MSB management UI
-
-**Bug Fixes**
-
-- MSB-372 Empty pages that looks like they should be deleted
-- MSB-374 MSB stripe of the headers with underscore and it blocks SDC API functionality
-
-**Known Issues**
-
-**Security Notes**
-
-MSB code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed.
-The remaining issues are identified as false positive and their risk assessment have been documented.
-
-Quick Links:
-       - `MSB project page for EI-Alto Release <https://wiki.onap.org/display/DW/Microservices+Bus+Project>`_
-
-       - `Passing Badge information for MSB <https://bestpractices.coreinfrastructure.org/en/projects/1601>`_
-
-       - `Project Vulnerability Review Table for MSB EI-Alto Release <https://wiki.onap.org/pages/viewpage.action?pageId=68541445>`_
-
-**Upgrade Notes**
-
-N/A
-
-**Deprecation Notes**
-
-N/A
-
-**Other**
-
-N/A
-
-Version: 1.2.4 Dublin Release
------------------------------
-
-:Release Date: 2019-06-10
-
-**New Features**
-
-This release only contains some security improvements and a few fixes.
-
-**Security improvements**
-
-- MSB MSB-295 Nexus IQ Issue: bootstrap
-- MSB MSB-320 Run API Gateway as a non-root user
-- MSBMSB-321 Run Discovery as a non-root user
-- MSB MSB-322 Run Kube2msb as a non-root user
-- MSB MSB-328 Security issue reported by Nexus-iq : jetty-http
-- MSB MSB-329 Security issue reported by Nexus-iq : spring-core
-- MSB MSB-330 Security issue reported by Nexus-iq : commons-beanutils
-- MSB MSB-331 Jackson datatype security issue
-
-**Bug Fixes**
-
-- MSB-98  No information is available to select proper node IP from registered services
-- MSB-281 improve CLM for swagger sdk
-- MSB-325 consul container is outdated
-- MSB-326 non STAGING version on master
-
-**Known Issues**
-
-**Security Notes**
-
-MSB code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed.
-The remaining issues are identified as false positive and their risk assessment have been documented.
-
-Quick Links:
-       - `MSB project page for Dublin Release <https://wiki.onap.org/display/DW/Microservices+Bus+Project>`_
-
-       - `Passing Badge information for MSB <https://bestpractices.coreinfrastructure.org/en/projects/1601>`_
-
-       - `Project Vulnerability Review Table for MSB Dublin Release <https://wiki.onap.org/pages/viewpage.action?pageId=64003723>`_
-
-**Upgrade Notes**
-
-N/A
-
-**Deprecation Notes**
-
-N/A
-
-**Other**
-
-N/A
-
-Version: 1.2.3
---------------
-
-:Release Date: 2018-11-30
-
-
-**New Features**
-
-In Casablanca Release, MSB mainly focuses on the integration of Istio service mesh with ONAP to enhance OMSA, while keeping the Istio integration compatible with the existing MSB API Gateway approaches.
-
-How to manage ONAP microservices with Istio service mesh:
-
-- https://wiki.onap.org/display/DW/Manage+ONAP+Microservices+with+Istio+Service+Mesh
-- https://wiki.onap.org/display/DW/Manage+ONAP+Microservices+with+Istio+Service+Mesh-Mutual+TLS+Authentication+Enabled
-
-**Bug Fixes**
-
-- `MSB-196 <https://jira.onap.org/browse/MSB-196>`_ IUI displays raw placeholder texts when failed to load translation
-- `MSB-291 <https://jira.onap.org/browse/MSB-291>`_ Incomplete Apache-2.0 header
-- `MSB-293 <https://jira.onap.org/browse/MSB-293>`_ Portal to MSB pairwise test failing in WindRiver with OOM deployment
-- `MSB-294 <https://jira.onap.org/browse/MSB-294>`_ Nexus IQ Issue: okhttp3
-- `MSB-296 <https://jira.onap.org/browse/MSB-296>`_ Nexus IQ Issue: guava
-- `MSB-297 <https://jira.onap.org/browse/MSB-297>`_ MSB CSIT failed
-- `MSB-298 <https://jira.onap.org/browse/MSB-298>`_ Release MSB artifact version 1.2.0
-- `MSB-300 <https://jira.onap.org/browse/MSB-300>`_ Incomplete Apache-2.0 header
-- `MSB-301 <https://jira.onap.org/browse/MSB-301>`_ Can't access aai resource http url via msb api gateway
-
-**Known Issues**
-
-- `MSB-295 <https://jira.onap.org/browse/MSB-295>`_ Nexus IQ Issue: bootstrap
-- `MSB-198 <https://jira.onap.org/browse/MSB-198>`_ MSB GUI can not register a service mapped to an HTTPS endpoint
-
-**Security Notes**
-
-MSB code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release.
-The MSB open Critical security vulnerabilities and their risk assessment have been documented.
-
-Quick Links:
-       - `MSB project page for Casablanca Release <https://wiki.onap.org/display/DW/Microservices+Bus+Project>`_
-
-       - `Passing Badge information for MSB <https://bestpractices.coreinfrastructure.org/en/projects/1601>`_
-
-       - `Project Vulnerability Review Table for MSB Casablanca Release <https://wiki.onap.org/pages/viewpage.action?pageId=45305668>`_
-
-**Upgrade Notes**
-
-N/A
-
-**Deprecation Notes**
-
-N/A
-
-**Other**
-
-N/A
-
-
-Version: 1.1.0
---------------
-
-:Release Date: 2018-06-07
-
-
-**New Features**
-In Beijing release, MSB project mainly focused on the Platform Maturity requirements of ONAP, including the scalability and security. Some new features which were requested when integrated with other projects, such as websocket support, service registration at K8S Pod level, multiple versions of services, etc. have also been added to this release.
-
-- `MSB-117 <https://jira.onap.org/browse/MSB-146>`_ Support horizontal scaling
-- `MSB-140 <https://jira.onap.org/browse/MSB-140>`_ Providing HTTPS endpoint at API gateway
-- `MSB-146 <https://jira.onap.org/browse/MSB-146>`_ Support service registration at K8s Pod level
-- `MSB-152 <https://jira.onap.org/browse/MSB-152>`_ MSB JAVA SDK supports HTTPS service registration
-- `MSB-156 <https://jira.onap.org/browse/MSB-156>`_ Support websocket request forwarding
-- `MSB-178 <https://jira.onap.org/browse/MSB-178>`_ Support registering multiple versions under a service name
-- `MSB-179 <https://jira.onap.org/browse/MSB-179>`_ Integration MSB GUI to Portal project
-
-**Bug Fixes**
-
-- `MSB-92 <https://jira.onap.org/browse/MSB-92>`_ Microservice delete is reporting 500, though it deleted the service
-- `MSB-102 <https://jira.onap.org/browse/MSB-102>`_ The msb client has heavy dependencies
-- `MSB-150 <https://jira.onap.org/browse/MSB-150>`_ Kube2msb doesn't unregister service
-- `MSB-153 <https://jira.onap.org/browse/MSB-153>`_ MSB kube2msb registrator does not register LoadBalancer type service
-- `MSB-187 <https://jira.onap.org/browse/MSB-187>`_ MSB discovery API in swagger is not published
-- `MSB-195 <https://jira.onap.org/browse/MSB-195>`_ HTTP protocol used over HTTPS port
-
-**Known Issues**
-
-N/A
-
-**Security Notes**
-
-MSB code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and determined to be false positive. The MSB open Critical security vulnerabilities and their risk assessment have been documented.
-
-Quick Links:
-
-- `MSB project page for  Beijing Release <https://wiki.onap.org/display/DW/Microservices+Bus+Project>`_
-- `Passing Badge information for MSB <https://bestpractices.coreinfrastructure.org/en/projects/1601>`_
-- `Project Vulnerability Review Table for MSB Beijing Release <https://wiki.onap.org/pages/viewpage.action?pageId=40927271>`_
-
-**Upgrade Notes**
-
-N/A
-
-**Deprecation Notes**
-
-N/A
-
-**Other**
-
-N/A
-
-
-Version: 1.0.0
---------------
-
-:Release Date: 2017-11-16
-
-
-**New Features**
-Initial release of Microservices Bus (MSB) for Open Network Automation Platform (ONAP). MSB provides core functionalities to support ONAP microservices architecture, including SDK for rapid microservie development, infrastructure for service communication and tools for service governance.
-
-The current release of MSB is mainly composed of the following components:
-
-**msb/apigateway**
-
-Provides client request routing, client request load balancing, transformation, such as https to http, authentication & authorization for service request with plugin of auth service provider, service request logging, service request rate-limiting, service monitoring, request result cache, solve cross-domain issue for web application and other functionalities with the pluggable architecture capability.
-
-**msb/discovery**
-
-Provides service registration and discovery for ONAP microservices, which leverage Consul and build an abstract layer on top of it to make it agnostic to the registration provider and add needed extension.
-
-**msb/java-sdk**
-
-Provides a JAVA SDK for rapid microservices development, including service registration, service discovery, request routing, load balancing, retry, etc.
-
-**msb/swagger-sdk**
-
-Swagger sdk helps to generate swagger.json and java client sdk during the build time, it also helps to provide the swagger.json at the given URI in the run time.
-
-In the future release, MSB plans to provide service mesh for ONAP.
-
-**Bug Fixes**
-
-- `MSB-94 <https://jira.onap.org/browse/MSB-94>`_ Vendor name(ZTE) on the MSB Portal tiltle
-- `MSB-91 <https://jira.onap.org/browse/MSB-91>`_ Duplicate class variable in service sub-classes
-- `MSB-88 <https://jira.onap.org/browse/MSB-88>`_ The path parameter has been lost when register services in demo project
-- `MSB-87 <https://jira.onap.org/browse/MSB-87>`_ MSB JAVA SDK dosen't release stage binary
-- `MSB-85 <https://jira.onap.org/browse/MSB-85>`_ API Gateway UT coverage doesn't show up in Sonar
-- `MSB-74 <https://jira.onap.org/browse/MSB-74>`_ Jenkins Integration Test job failed
-- `MSB-73 <https://jira.onap.org/browse/MSB-73>`_ Can't register service by using MSB Api gateway 80 port
-- `MSB-72 <https://jira.onap.org/browse/MSB-72>`_ Unit test coverage data is incorrect
-- `MSB-71 <https://jira.onap.org/browse/MSB-71>`_ API Gateway service Registration and discovery api causes confusion
-- `MSB-70 <https://jira.onap.org/browse/MSB-70>`_ Swagger SDK site job build failed
-- `MSB-69 <https://jira.onap.org/browse/MSB-69>`_ Discovery checkstyle issue
-- `MSB-68 <https://jira.onap.org/browse/MSB-68>`_ Discovery daily build jenkins job failed
-- `MSB-67 <https://jira.onap.org/browse/MSB-67>`_ API Gateway check style warnning
-- `MSB-66 <https://jira.onap.org/browse/MSB-66>`_ API Gateway daily build failed
-- `MSB-60 <https://jira.onap.org/browse/MSB-60>`_ API gateway test coverage data not in snoar
-- `MSB-59 <https://jira.onap.org/browse/MSB-59>`_ Swagger SDK build failed
-- `MSB-58 <https://jira.onap.org/browse/MSB-58>`_ MSB Java SDK Jenkins merge job failed
-- `MSB-57 <https://jira.onap.org/browse/MSB-57>`_ Discovery site jenkins job failed
-- `MSB-55 <https://jira.onap.org/browse/MSB-55>`_ Discovery site jenkins job failed
-- `MSB-54 <https://jira.onap.org/browse/MSB-54>`_ API Gateway site jenkins job failed
-- `MSB-21 <https://jira.onap.org/browse/MSB-21>`_ Merge and daily jenkins job failed
-- `MSB-17 <https://jira.onap.org/browse/MSB-17>`_ Release version java daily job failed
-
-**Known Issues**
-
-- `MSB-92 <https://jira.onap.org/browse/MSB-92>`_ Microservice delete is reporting 500, though it deleted the service
-
-**Security Issues**
-
-None
-
-**Upgrade Notes**
-
-This is an initial release
-
-**Deprecation Notes**
-
-N/A
-
-**Other**
-
-N/A
-
-End of Release Notes
diff --git a/docs/docs/requirements-docs.txt b/docs/docs/requirements-docs.txt
deleted file mode 100644 (file)
index b3188dd..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-tox
-Sphinx
-doc8
-docutils
-setuptools
-six
-sphinx_rtd_theme>=0.4.3
-sphinxcontrib-blockdiag
-sphinxcontrib-needs>=0.2.3
-sphinxcontrib-nwdiag
-sphinxcontrib-seqdiag
-sphinxcontrib-swaggerdoc
-sphinxcontrib-plantuml
-sphinx_bootstrap_theme
-lfdocs-conf
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
deleted file mode 100644 (file)
index b3188dd..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-tox
-Sphinx
-doc8
-docutils
-setuptools
-six
-sphinx_rtd_theme>=0.4.3
-sphinxcontrib-blockdiag
-sphinxcontrib-needs>=0.2.3
-sphinxcontrib-nwdiag
-sphinxcontrib-seqdiag
-sphinxcontrib-swaggerdoc
-sphinxcontrib-plantuml
-sphinx_bootstrap_theme
-lfdocs-conf
similarity index 55%
rename from docs/tox.ini
rename to tox.ini
index a538317..815b151 100644 (file)
+++ b/tox.ini
@@ -6,9 +6,9 @@ skipsdist = true
 [testenv:docs]
 basepython = python3
 deps =
-    -r{toxinidir}/etc/requirements.txt
-    -c{toxinidir}/etc/upper-constraints.os.txt
-    -c{toxinidir}/etc/upper-constraints.onap.txt
+    -r{toxinidir}/docs/etc/requirements.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
 commands =
     sphinx-build -W -q -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
     echo "Generated docs available in {toxinidir}/docs/_build/html"
@@ -20,9 +20,9 @@ whitelist_externals =
 [testenv:docs-templates]
 basepython = python3
 deps =
-    -r{toxinidir}/etc/requirements.txt
-    -c{toxinidir}/etc/upper-constraints.os.txt
-    -c{toxinidir}/etc/upper-constraints.onap.txt
+    -r{toxinidir}/docs/etc/requirements.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
 commands =
     sphinx-build -b html -n -d {envtmpdir}/doctrees -c {toxinidir}/docs ./docs/guides/onap-developer/how-to-use-docs/templates {toxinidir}/docs/_build/html/templates
     echo "Generated docs available in {toxinidir}/docs/_build/html/templates"
@@ -32,9 +32,9 @@ whitelist_externals =
 [testenv:local]
 basepython = python3
 deps =
-    -r{toxinidir}/etc/requirements.txt
-    -c{toxinidir}/etc/upper-constraints.os.txt
-    -c{toxinidir}/etc/upper-constraints.onap.txt
+    -r{toxinidir}/docs/etc/requirements.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
 commands =
     git submodule update --depth 100 --init
     sphinx-build -q -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
@@ -46,32 +46,32 @@ whitelist_externals =
 [testenv:docs-linkcheck]
 basepython = python3
 deps =
-    -r{toxinidir}/etc/requirements.txt
-    -c{toxinidir}/etc/upper-constraints.os.txt
-    -c{toxinidir}/etc/upper-constraints.onap.txt
+    -r{toxinidir}/docs/etc/requirements.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
 commands = sphinx-build -q -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
 
 [testenv:spellcheck]
 basepython = python3
 deps =
-    -r{toxinidir}/etc/requirements.txt
-    -c{toxinidir}/etc/upper-constraints.os.txt
-    -c{toxinidir}/etc/upper-constraints.onap.txt
+    -r{toxinidir}/docs/etc/requirements.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
 commands =
     sphinx-build -b spelling -Dextensions=sphinxcontrib.spelling -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/spellcheck
 
 [testenv:autopep8]
 deps =
-    -r{toxinidir}/etc/requirements.txt
-    -c{toxinidir}/etc/upper-constraints.os.txt
-    -c{toxinidir}/etc/upper-constraints.onap.txt
+    -r{toxinidir}/docs/etc/requirements.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
 commands =
     autopep8 --max-line-length 120 --in-place docs/conf.py
 
 [testenv:pylint]
 deps =
-    -r{toxinidir}/etc/requirements.txt
-    -c{toxinidir}/etc/upper-constraints.os.txt
-    -c{toxinidir}/etc/upper-constraints.onap.txt
+    -r{toxinidir}/docs/etc/requirements.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
 commands =
     pylint --max-line-length=120 --disable=missing-docstring --reports=y --score=y  --output-format=colorized docs/conf.py