SEBA-566 Add linting and fix errors in simpleexampleservice
Change-Id: I9a7fa83f528e70877a19de6f21e1e41a5812741c
diff --git a/Makefile b/Makefile
index 0451226..888888c 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
@@ -63,7 +63,7 @@
venv-service:
virtualenv $@;\
source ./$@/bin/activate ; set -u ;\
- python venv-service/bin/pip install -r requirements.txt xosmigrate~=3.0.1
+ python venv-service/bin/pip install -r requirements.txt xosmigrate~=3.2.1
create-migration: venv-service
source ./venv-service/bin/activate; set -u;\
@@ -73,6 +73,10 @@
source ./venv-service/bin/activate; set -u;\
cd xos; python ../venv-service/bin/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;\
+ python venv-service/bin/xosgenx --lint --strict xos/synchronizer/models/simpleexampleservice.xproto
+
clean:
find . -name '*.pyc' | xargs rm -f
rm -rf \
diff --git a/VERSION b/VERSION
index 26aaba0..538ee20 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.0
+1.2.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/0004_auto_20190409_1927.py b/xos/synchronizer/migrations/0004_auto_20190409_1927.py
new file mode 100644
index 0000000..cb15aaf
--- /dev/null
+++ b/xos/synchronizer/migrations/0004_auto_20190409_1927.py
@@ -0,0 +1,39 @@
+# 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:27
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('simpleexampleservice', '0003_auto_20190308_1636'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='simpleexampleservice',
+ name='service_message',
+ field=models.CharField(help_text=b'Service Message to display in web page', max_length=256),
+ ),
+ migrations.AlterField(
+ model_name='simpleexampleserviceinstance',
+ name='tenant_message',
+ field=models.CharField(help_text=b'Tenant Message to Display', max_length=256),
+ ),
+ ]
diff --git a/xos/synchronizer/models/simpleexampleservice.xproto b/xos/synchronizer/models/simpleexampleservice.xproto
index 5cf4e70..f17dc46 100644
--- a/xos/synchronizer/models/simpleexampleservice.xproto
+++ b/xos/synchronizer/models/simpleexampleservice.xproto
@@ -7,9 +7,10 @@
required string service_message = 1 [
help_text = "Service Message to display in web page",
- max_length = 254];
+ max_length = 256];
optional string service_secret = 2 [
- help_text = "Service Secret to place in a file"];
+ help_text = "Service Secret to place in a file",
+ text = True];
}
// Note: Named ColorNew to prevent name collision with ExampleService's Color.
@@ -43,7 +44,7 @@
required string tenant_message = 1 [
help_text = "Tenant Message to Display",
- max_length = 254];
+ max_length = 256];
optional manytoone foreground_color->ColorNew:serviceinstance_foreground_colors = 2:1001 [
help_text = "Foreground color to use in web page",
db_index = True];
@@ -51,7 +52,8 @@
help_text = "Background color to use in web page",
db_index = True];
optional string tenant_secret = 4 [
- help_text = "Tenant Secret to place in a file"];
+ help_text = "Tenant Secret to place in a file",
+ text = True];
}
// Note: Named EmbeddedImageNew to prevent name collision with ExampleService's EmbeddedImage.