SEBA-566 Add linting and fix errors in onos-service
Change-Id: If84a9d5d47ec490acf98b6d9790dd1baff21875b
diff --git a/Makefile b/Makefile
index c29b928..2d624e9 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@
docker-push:
docker push ${DOCKER_IMAGENAME}
-test: test-unit test-migration
+test: test-unit test-migration test-xproto
test-unit:
tox
@@ -60,7 +60,7 @@
venv-service:
virtualenv $@;\
source ./$@/bin/activate ; set -u ;\
- pip install -r requirements.txt xosmigrate~=3.0.1
+ pip install -r requirements.txt xosmigrate~=3.2.1
create-migration: venv-service
source ./venv-service/bin/activate; set -u;\
@@ -70,6 +70,10 @@
source ./venv-service/bin/activate; set -u;\
cd xos; xos-migrate --xos-dir ${XOS_DIR} --services-dir ${SERVICES_DIR} -s ${SERVICE_NAME} --check
+test-xproto: venv-service
+ source ./venv-service/bin/activate; set -u;\
+ xosgenx --lint --strict xos/synchronizer/models/onos.xproto
+
clean:
find . -name '*.pyc' | xargs rm -f
rm -rf \
diff --git a/VERSION b/VERSION
index 7ec1d6d..7c7e096 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0
+2.1.1-dev
diff --git a/requirements.txt b/requirements.txt
index e039eea..669c29b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-xossynchronizer~=3.0.1
-xosapi~=3.0.1
-xoskafka~=3.0.1
+xossynchronizer~=3.2.1
+xosapi~=3.2.1
+xoskafka~=3.2.1
diff --git a/xos/synchronizer/migrations/0005_auto_20190409_1919.py b/xos/synchronizer/migrations/0005_auto_20190409_1919.py
new file mode 100644
index 0000000..a3ab6d9
--- /dev/null
+++ b/xos/synchronizer/migrations/0005_auto_20190409_1919.py
@@ -0,0 +1,45 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-04-09 23:19
+from __future__ import unicode_literals
+
+import core.models.xosbase_header
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('onos', '0004_auto_20190312_1829'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='onosservice_decl',
+ name='rest_hostname',
+ field=core.models.xosbase_header.StrippedCharField(help_text=b'Hostname of ONOS Service REST endpoint', max_length=256),
+ ),
+ migrations.AlterField(
+ model_name='onosservice_decl',
+ name='rest_password',
+ field=core.models.xosbase_header.StrippedCharField(default=b'karaf', help_text=b'Password to use when authenticating to ONOS', max_length=256),
+ ),
+ migrations.AlterField(
+ model_name='onosservice_decl',
+ name='rest_username',
+ field=core.models.xosbase_header.StrippedCharField(default=b'karaf', help_text=b'Username to use when authenticating to ONOS', max_length=256),
+ ),
+ ]
diff --git a/xos/synchronizer/models/onos.xproto b/xos/synchronizer/models/onos.xproto
index 8f27d32..ae479ab 100644
--- a/xos/synchronizer/models/onos.xproto
+++ b/xos/synchronizer/models/onos.xproto
@@ -32,7 +32,7 @@
required string rest_hostname = 1 [
help_text = "Hostname of ONOS Service REST endpoint",
content_type = "stripped",
- max_length = 255];
+ max_length = 256];
required int32 rest_port = 2 [
help_text = "Port numnber of ONOS Service REST endpoint",
default = 8181];
@@ -40,10 +40,10 @@
help_text = "Username to use when authenticating to ONOS",
content_type = "stripped",
default="karaf",
- max_length = 255];
+ max_length = 256];
required string rest_password = 4 [
help_text = "Password to use when authenticating to ONOS",
content_type = "stripped",
default="karaf",
- max_length = 255];
+ max_length = 256];
}