Merge "moved tutorial section (also fixed REST APIs)"
diff --git a/Makefile b/Makefile
index 8d596b8..a084f5f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@
# Other repos with documentation that's included in the gitbook
# edit the `git_refs` file with the commit/tag/branch that you want to use
-OTHER_REPO_DOCS ?= cord-tester fabric hippie-oss kubernetes-service olt-service onos-service openolt openstack rcord simpleexampleservice vrouter xos xos-gui xos-tosca
+OTHER_REPO_DOCS ?= cord-tester fabric hippie-oss kubernetes-service olt-service onos-service openolt openstack rcord simpleexampleservice exampleservice vrouter xos xos-gui xos-tosca
GENERATED_DOCS ?= # should be 'swagger', but currently broken
ALL_DOCS ?= $(OTHER_REPO_DOCS) $(GENERATED_DOCS)
diff --git a/SUMMARY.md b/SUMMARY.md
index 16e9043..5da0124 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -74,6 +74,7 @@
* [VTN and Service Composition](xos/xos_vtn.md)
* [Example Services](examples/examples.md)
* [SimpleExampleService](simpleexampleservice/simple-example-service.md)
+ * [ExampleService](exampleservice/example-service.md)
* [GUI Development](xos-gui/developer/README.md)
* [Quickstart](xos-gui/developer/quickstart.md)
* [GUI Extensions](xos-gui/developer/gui_extensions.md)
diff --git a/git_refs b/git_refs
index fcadce1..7faa57f 100644
--- a/git_refs
+++ b/git_refs
@@ -21,6 +21,7 @@
openstack /docs master
rcord /docs master
simpleexampleservice /docs master
+exampleservice /docs master
vrouter /docs master
xos-gui /docs master
xos-tosca /docs master
diff --git a/prereqs/hardware.md b/prereqs/hardware.md
index 20eb576..820ff9a 100644
--- a/prereqs/hardware.md
+++ b/prereqs/hardware.md
@@ -72,14 +72,22 @@
copper cable, 3m length - S/N: QSFP-40G-03C
* **R-CORD Access Devices and Optics**
+ * **GPON**
+ * **OLT**: Celestica CLS Ruby S1010 (experimental, only top-down provisioning is supported - through manual customizations)
+ * Compatible **OLT optics**
+ * OptoWiz LSP4343-CKSA-R GPON SFP OLT Transceiver
+ * **ONUs**:
+ * Celestica Tellion GP-1204
+ * Movistar ONU (with CPE included) (manifactured by Telefonica: <http://www.movistar.es/particulares/movil/moviles/hgu>)
* **XGS-PON**
* **OLT**: EdgeCore ASFVOLT16 (for more info <bartek_raszczyk@edge-core.com>)
- * Compatible **OLT optics**
- * Hisense/Ligent: LTH7226-PC, LTH7226-PC+
- ** Source Photonics: XPP-XG2-N1-CDFA
- * **ONU**: AlphaNetworks PON-34000B (for more info <ed-y_chen@alphanetworks.com>)
- * Compatible **ONU optics**
- * Hisense/Ligent: LTF7225-BC, LTF7225-BH+
+ * Compatible **OLT optics**
+ * Hisense/Ligent: LTH7226-PC, LTH7226-PC+
+ * Source Photonics: XPP-XG2-N1-CDFA
+ * **ONUs**:
+ * AlphaNetworks PON-34000B (for more info <ed-y_chen@alphanetworks.com>)
+ * Compatible **ONU optics**
+ * Hisense/Ligent: LTF7225-BC, LTF7225-BH+
* **M-CORD Specific Requirements**
* **Servers**: Some components of CORD require at least a Intel XEON CPU with Haswell microarchitecture or better.
diff --git a/prereqs/openstack-helm.md b/prereqs/openstack-helm.md
index d60f9a8..7627a45 100644
--- a/prereqs/openstack-helm.md
+++ b/prereqs/openstack-helm.md
@@ -61,6 +61,15 @@
```
```bash
+cat <<EOF > /tmp/libvirt-cord.yaml
+---
+network:
+ backend: []
+EOF
+export OSH_EXTRA_HELM_ARGS_LIBVIRT="-f /tmp/libvirt-cord.yaml"
+```
+
+```bash
cat <<EOF > /tmp/nova-cord.yaml
---
labels: