[CORD-3180] Setting app_id as mandatory and handling 409 error
Change-Id: Ie712d1e8e6bef402c63893f070ebb5de9f01e518
diff --git a/xos/synchronizer/models/models.py b/xos/synchronizer/models/models.py
new file mode 100644
index 0000000..9c01b5b
--- /dev/null
+++ b/xos/synchronizer/models/models.py
@@ -0,0 +1,35 @@
+# 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.
+
+from xos.exceptions import XOSValidationError
+
+from models_decl import ONOSApp_decl
+from models_decl import ONOSService_decl
+
+class ONOSApp(ONOSApp_decl):
+ class Meta:
+ proxy = True
+
+ def save(self, *args, **kwargs):
+
+ if self.url and not self.version:
+ raise XOSValidationError("If you specify and url, you also need to specify a version. ONOSApp: %s" % self.name)
+
+ super(ONOSApp, self).save(*args, **kwargs)
+
+
+class ONOSService(ONOSService_decl):
+ class Meta:
+ proxy = True
+
diff --git a/xos/synchronizer/models/onos.xproto b/xos/synchronizer/models/onos.xproto
index 726702d..041d7e4 100644
--- a/xos/synchronizer/models/onos.xproto
+++ b/xos/synchronizer/models/onos.xproto
@@ -1,15 +1,15 @@
-option kind="onos";
option app_label = "onos";
option name="onos";
+option legacy="True";
message ONOSApp (ServiceInstance){
option verbose_name="ONOS Application";
option owner_class_name="ONOSService";
- optional string app_id = 1 [db_index = False, null = True, blank = False];
+ 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];
- required string version = 4 [db_index = False, null = True, blank = False];
+ optional string version = 4 [db_index = False, null = True, blank = False];
}
message ONOSService (Service){