AETHER-2086 Add description of API Docs
Also added details of Atomix chart version
Change-Id: I9e02cb40ceaa1072e27267f37dd60fc4fb9358f8
diff --git a/amp/roc.rst b/amp/roc.rst
index 6228922..f1b9d3d 100755
--- a/amp/roc.rst
+++ b/amp/roc.rst
@@ -110,6 +110,7 @@
Below is a high-level architectural diagram of the ROC:
.. image:: images/aether-architecture.svg
+ :width: 1000
The following walks through the main stack of ROC components in a top-down manner, starting with the GUI(s) and
ending with the devices/services.
@@ -245,6 +246,7 @@
There is one set of Aether modeling that might have customer-facing and internal-facing aspects.
.. image:: images/aether-highlevel.svg
+ :width: 600
The above diagram is an example of how a single set of models could serve both high-level and low-level needs and
is not necessarily identical to the current implementation.
@@ -258,6 +260,7 @@
An approximation of the current Aether-3.0 (Release 1.5) modeling is presented below:
.. image:: images/aether-3.0-models.svg
+ :width: 800
The key Enterprise-facing abstractions are *Applicatio*\ n, *Virtual Cellular Service* (VCS), and *DeviceGroup*.
diff --git a/developer/roc-api.rst b/developer/roc-api.rst
index 47b94e1..2708450 100644
--- a/developer/roc-api.rst
+++ b/developer/roc-api.rst
@@ -3,6 +3,21 @@
Aether ROC Control API
======================
+Access
+------
+The ROC API specification can be accessed from the running ROC cluster at the API URL.
+
+e.g. on a local system (if the GUI has been port-forwarded on port 8183)
+*http://localhost:8183/aether-roc-api/*
+
+On the Production system it would be *https://roc.aetherproject.org/aether-roc-api/*
+
+.. note:: Opening this in a browser will display a HTML view of the API (powered by *ReDoc*).
+
+ To access the raw YAML format use
+ ``curl -H "Accept: application/yaml" http://localhost:8183/aether-roc-api/aether-3.0.0-openapi3.yaml``
+ This YAML format can be imported in to various different tools e.g. |postman_link|
+
Background
----------
@@ -24,7 +39,7 @@
* `PATCH http://roc/aether/v3.0.0/connectivity-service-v3/site/Starbucks-NewYork`. Update the Starbucks New York site.
This document is a high-level description of the objects that can be interacted with. For a
-low-level description, see the Swagger API specification.
+low-level description, see the specification (:ref:`developer/roc-api:Access` section above).
Identifying and Referencing Objects
-----------------------------------
@@ -203,3 +218,7 @@
* `address`. Hostname or IP address of UPF.
* `port`. Port number of UPF.
* `enterprise`. Enterprise that owns this UPF.
+
+.. |postman_link| raw:: html
+
+ <a href="http://postman.com" target="_blank">Postman</a>
diff --git a/developer/roc.rst b/developer/roc.rst
index e3a3dac..4b8c727 100644
--- a/developer/roc.rst
+++ b/developer/roc.rst
@@ -28,22 +28,40 @@
kubectl create namespace micro-onos
# install atomix
- helm -n kube-system install atomix-controller atomix/atomix-controller
- helm -n kube-system install atomix-raft-storage atomix/atomix-raft-storage
+ export ATOMIX_CONTROLLER_VERSION=0.6.7
+ helm -n kube-system install atomix-controller atomix/atomix-controller --version $ATOMIX_CONTROLLER_VERSION
+ export ATOMIX_RAFT_VERSION=0.1.8
+ helm -n kube-system install atomix-raft-storage atomix/atomix-raft-storage --VERSION $ATOMIX_RAFT_VERSION
# install the onos operator
- helm install -n kube-system onos-operator onosproject/onos-operator
+ ONOS_OPERATOR_VERSION=0.4.8
+ helm install -n kube-system onos-operator onosproject/onos-operator --version $ONOS_OPERATOR_VERSION
+.. note:: The ROC is sensitive to the versions of Atomix and onos-operator installed. The values
+ shown above are correct for the 1.2.x versions of the *aether-roc-umbrella*.
+
+.. list-table:: ROC support component version matrix
+ :widths: 28 24 24 24
+ :header-rows: 1
+
+ * - ROC Version
+ - Atomix Controller
+ - Atomix Raft
+ - Onos Operator
+ * - 1.2.x
+ - 0.6.7
+ - 0.1.8
+ - 0.4.8
Verify that these services were installed properly.
You should see pods for *atomix-controller*, *atomix-raft-storage-controller*,
*onos-operator-config*, and *onos-operator-topo*.
Execute these commands::
+ helm -n kube-system list
kubectl -n kube-system get pods | grep -i atomix
kubectl -n kube-system get pods | grep -i onos
-
Create a values-override.yaml
-----------------------------
@@ -172,6 +190,11 @@
``aether-roc-gui`` is useful to be able to interactively browse the current configuration.
+.. note:: Internally the ``aether-roc-gui`` operates a Reverse Proxy on the ``aether-roc-api``. This
+ means that if you have done a ``port-forward`` to ``aether-roc-gui`` say on port ``8183`` there's no
+ need to do another on the ``aether-roc-api`` instead you can access the API on
+ ``http://localhost:8183/aether-roc-api``
+
Deploying using custom images
-----------------------------