SEBA-662 Remove unnecessary _decl models
Change-Id: I3ffa1033c94b5c37c5bd035ec7e6f2c791e27def
diff --git a/xos/synchronizer/config.yaml b/xos/synchronizer/config.yaml
index f68dc8b..6c59579 100644
--- a/xos/synchronizer/config.yaml
+++ b/xos/synchronizer/config.yaml
@@ -15,7 +15,7 @@
name: volt
-core_version: ">=2.2.1"
+core_version: ">=3.2.7"
required_models:
- VOLTService
- VOLTServiceInstance
diff --git a/xos/synchronizer/models/models.py b/xos/synchronizer/models/models.py
index d02adff..9dec2c9 100644
--- a/xos/synchronizer/models/models.py
+++ b/xos/synchronizer/models/models.py
@@ -41,10 +41,6 @@
except IndexError, e:
return False
-class VOLTServiceInstance(VOLTServiceInstance_decl):
- class Meta:
- proxy = True
-
class OLTDevice(OLTDevice_decl):
class Meta:
proxy = True
@@ -87,19 +83,6 @@
super(OLTDevice, self).delete(*args, **kwargs)
-class PortBase(PortBase_decl):
- class Meta:
- proxy = True
-
-class PONPort(PONPort_decl):
- class Meta:
- proxy = True
-
-class NNIPort(NNIPort_decl):
- class Meta:
- proxy = True
-
-
class ONUDevice(ONUDevice_decl):
class Meta:
proxy = True
@@ -111,14 +94,6 @@
super(ONUDevice, self).delete(*args, **kwargs)
-class ANIPort(ANIPort_decl):
- class Meta:
- proxy = True
-
-class UNIPort(UNIPort_decl):
- class Meta:
- proxy = True
-
class TechnologyProfile(TechnologyProfile_decl):
class Meta:
proxy = True
diff --git a/xos/synchronizer/models/volt.xproto b/xos/synchronizer/models/volt.xproto
index ec06ff1..91ee685 100644
--- a/xos/synchronizer/models/volt.xproto
+++ b/xos/synchronizer/models/volt.xproto
@@ -1,11 +1,11 @@
option name = "volt";
option app_label = "volt";
-option legacy="True";
message VOLTService (Service){
option verbose_name = "vOLT Service";
option kind = "vOLT";
option description = "OLT Access Service";
+ option custom_python = "True";
required string voltha_url = 1 [
help_text = "The Voltha API address. By default voltha.voltha.svc.cluster.local",
@@ -42,6 +42,7 @@
message OLTDevice (XOSBase){
option verbose_name = "OLT Device";
option description="Represents a physical OLT device";
+ option custom_python = "True";
required manytoone volt_service->VOLTService:volt_devices = 1:1001 [
help_text = "VOLTService that owns this OLT",
@@ -160,6 +161,7 @@
message ONUDevice (XOSBase){
option verbose_name = "ONU Device";
option description = "Represents a physical ONU device";
+ option custom_python = "True";
required manytoone pon_port->PONPort:onu_devices = 1:1001 [
help_text = "PONPort that connects this ONUDevice to an OLTDevice",
@@ -234,6 +236,7 @@
message TechnologyProfile (XOSBase) {
option verbose_name = "Technology Profile";
option description = "The Technology Profile that is utilized by VOLTHA";
+ option custom_python = "True";
required string technology = 1 [
help_text = "The technology being utilized by the adaptor",