[SEBA-126] Fixing validation
Change-Id: I4427518b51b45282bd5d84da121086a008783f3e
diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index eb38448..5589b48 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -14,7 +14,7 @@
# xosproject/onos-synchronizer
-FROM xosproject/xos-synchronizer-base:2.0.0
+FROM xosproject/xos-synchronizer-base:master
COPY xos/synchronizer /opt/xos/synchronizers/onos
COPY VERSION /opt/xos/synchronizers/onos/
diff --git a/VERSION b/VERSION
index 38f77a6..94245d2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.1
+2.0.2-dev
diff --git a/xos/synchronizer/models/onos.xproto b/xos/synchronizer/models/onos.xproto
index 041d7e4..e3b553a 100644
--- a/xos/synchronizer/models/onos.xproto
+++ b/xos/synchronizer/models/onos.xproto
@@ -6,17 +6,17 @@
option verbose_name="ONOS Application";
option owner_class_name="ONOSService";
- required string app_id = 1 [db_index = False, null = False, blank = False];
- required string dependencies = 2 [help_text="Comma separated list of required applications", db_index = False, null = True, blank = True];
- optional string url = 3 [help_text="URL at which the application is available, if it needs to be downloaded", db_index = False, null = True, blank = False];
- optional string version = 4 [db_index = False, null = True, blank = False];
+ required string app_id = 1 [db_index = False];
+ optional string dependencies = 2 [help_text="Comma separated list of required applications", db_index = False];
+ optional string url = 3 [help_text="URL at which the application is available, if it needs to be downloaded", db_index = False];
+ optional string version = 4 [db_index = False];
}
message ONOSService (Service){
option verbose_name="ONOS Service";
- required string rest_hostname = 1 [db_index = False, max_length = 255, null = False, content_type = "stripped", blank = False];
- required int32 rest_port = 2 [default = 8181, null = False, db_index = False, blank = False];
- required string rest_username = 3 [db_index = False, max_length = 255, null = False, content_type = "stripped", blank = False, default="karaf"];
- required string rest_password = 4 [db_index = False, max_length = 255, null = False, content_type = "stripped", blank = False, default="karaf"];
+ required string rest_hostname = 1 [db_index = False, max_length = 255, content_type = "stripped"];
+ required int32 rest_port = 2 [default = 8181, db_index = False];
+ required string rest_username = 3 [db_index = False, max_length = 255, content_type = "stripped", default="karaf"];
+ required string rest_password = 4 [db_index = False, max_length = 255, content_type = "stripped", default="karaf"];
}