Dep update and update python requirements.txt
dep update protos to current tagged version.
No functional change.
Update requirements.txt to pip released versions
of voltha-protos and pyvoltha.
Also doc update to reflect golang 1.12 install and
combined Makefile
Change-Id: I455cc84ab4ead7aa26f49c3d35227f5d8a360808
diff --git a/Gopkg.lock b/Gopkg.lock
index 6d17f4b..5539da0 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -301,7 +301,7 @@
[[projects]]
branch = "master"
- digest = "1:2c1d6ea362dc6d4925599e93fa108d913078141a7149de49e868b24110f0ee7e"
+ digest = "1:b8d30e71e7cdb75584d2c85caec669e6f3e1c4dd4f89f767dd835bd2104e988b"
name = "github.com/opencord/voltha-protos"
packages = [
"go/afrouter",
@@ -313,7 +313,7 @@
"go/voltha",
]
pruneopts = "T"
- revision = "12fc0af25cd0e34555535be9949af64556569fcb"
+ revision = "aa26066f768886fc79374fd2c56e89191844779d"
[[projects]]
branch = "master"
diff --git a/python/requirements.txt b/python/requirements.txt
index c3ead8b..b77bda8 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -60,8 +60,8 @@
etcd3==0.7.0
pyparsing==2.2.0
packaging==17.1
-pyvoltha==0.1.8
-voltha-protos==0.1.2
+pyvoltha==0.1.9
+voltha-protos==0.1.3
# python-consul>=0.6.1 we need the pre-released version for now, because 0.6.1 does not
# yet support Twisted. Once this is released, it will be the 0.6.2 version
diff --git a/quickstart.md b/quickstart.md
index e217afa..dd6695f 100644
--- a/quickstart.md
+++ b/quickstart.md
@@ -19,16 +19,24 @@
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
sudo apt update
-sudo apt install build-essential golang-1.10 docker-ce docker-compose virtualenv git python-setuptools python-dev libpcap-dev libffi-dev libssl-dev tox
+sudo apt install build-essential docker-ce docker-compose virtualenv git python-setuptools python-dev libpcap-dev libffi-dev libssl-dev tox
```
-Setup a local Golang environment, adding the golang-1.10 binaries to your path and also your local GOPATH's bin folder.
+Snap install golang 1.12. Inform apparmor (if being used) of the change. The apparmor_parser step may need to be run again after reboot. This appears to be a snapd bug.
+```sh
+sudo snap install --classic go
+snap list
+sudo apparmor_parser -r /var/lib/snapd/apparmor/profiles/snap*
+```
+
+Setup a local Golang environment, verifying the golang-1.12 binaries are in your path. Also add your local GOPATH's bin folder to PATH.
Add to your ~/.profile to persist.
```sh
+go version
mkdir $HOME/go
export GOPATH=$HOME/go
-export PATH=$PATH:/usr/lib/go-1.10/bin:$GOPATH/bin
+export PATH=$PATH:$GOPATH/bin
```
Allow non-root user docker system access
@@ -129,7 +137,7 @@
```
The steps below generate the needed docker images and the Docker build system sets up the Go environment within a container image. Build Go docker images, rw_core being whats most needed for now.
-This should work without setting up a golang environment:
+This should work without setting up a golang environment. This also builds needed ofagent and cli docker images:
```sh
export DOCKER_TAG=latest
cd ~/source/voltha-go
@@ -141,13 +149,6 @@
export LOCAL_VOLTHAGO=true
```
-Build Python CLI and OFAgent docker images.
-```sh
-export DOCKER_TAG=latest
-cd ~/source/voltha-go/python
-make build
-```
-
### VOLTHA 2.0 OpenOLT (Golang and Python)
@@ -166,20 +167,13 @@
Build the openolt container. Above LOCAL environment variables can be used to include local library builds of PyVoltha, voltha-go, and voltha-protos. This will copy the pyvoltha tar.gz and voltha-protos from their respective build tree and include in the openolt build tree.
-Golang Openolt
+Golang and Python Openolt
```sh
export DOCKER_TAG=latest
cd ~/source/voltha-openolt-adapter/
make build
```
-Python Openolt
-```sh
-export DOCKER_TAG=latest
-cd ~/source/voltha-openolt-adapter/python/
-make build
-```
-
### VOLTHA 2.0 OpenONU (Python)
@@ -192,7 +186,7 @@
Build the openonu container. Above LOCAL environment variables can be used to include local builds of PyVoltha and voltha-protos. This will copy the pyvoltha tar.gz and voltha-protos from their respective build tree and include in the openonu build tree.
```sh
export DOCKER_TAG=latest
-cd ~/source/voltha-openonu-adapter/python
+cd ~/source/voltha-openonu-adapter/
make build
```
diff --git a/vendor/github.com/opencord/voltha-protos/VERSION b/vendor/github.com/opencord/voltha-protos/VERSION
index 7a8795e..b1e80bb 100644
--- a/vendor/github.com/opencord/voltha-protos/VERSION
+++ b/vendor/github.com/opencord/voltha-protos/VERSION
@@ -1 +1 @@
-0.1.3-dev
+0.1.3