Subscriber clean_up
Change-Id: Ifcebcfee70d3edbc520d1c8ff1128c57e2ee1af2
diff --git a/xos/synchronizer/models/models.py b/xos/synchronizer/models/models.py
index 0985848..4cbaf13 100644
--- a/xos/synchronizer/models/models.py
+++ b/xos/synchronizer/models/models.py
@@ -64,10 +64,6 @@
raise XOSProgrammingError("RCORDSubscriber's self.caller was not set")
self.creator = self.caller
- if (not hasattr(self, 'caller') or not self.caller.is_admin):
- if (self.has_field_changed("service_specific_id")):
- raise XOSPermissionDenied("You do not have permission to change service_specific_id")
-
# validate IP Address
if hasattr(self, 'ip_address') and self.ip_address is not None:
try:
diff --git a/xos/synchronizer/models/rcord.xproto b/xos/synchronizer/models/rcord.xproto
index 3e7391a..6fb1bb8 100644
--- a/xos/synchronizer/models/rcord.xproto
+++ b/xos/synchronizer/models/rcord.xproto
@@ -14,18 +14,11 @@
// vsg related configurations
optional manytoone creator->User:created_rcord_subscribers = 15 [db_index = True, null = True, blank = True];
- optional bool firewall_enable = 1 [default = False, null = False, db_index = False, blank = True];
- optional string firewall_rules = 2 [default = "accept all anywhere anywhere", null = True, db_index = False, blank = True];
- optional bool url_filter_enable = 3 [default = False, null = False, db_index = False, blank = True];
- optional string url_filter_rules = 4 [default = "allow all", null = True, db_index = False, blank = True];
- optional string url_filter_level = 5 [default = "PG", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
- optional bool cdn_enable = 6 [default = False, null = False, db_index = False, blank = True];
- optional int32 uplink_speed = 8 [default = 1000000000, null = False, db_index = False, blank = False];
- optional int32 downlink_speed = 9 [default = 1000000000, null = False, db_index = False, blank = False];
optional string status = 11 [default = "enabled", choices = "(('enabled', 'Enabled'), ('disabled', 'Disabled'), ('pre-provisioned', 'Pre Provisioned'), ('awaiting-auth', 'Awaiting Authentication'), ('auth-failed', 'Authentication Failed'))", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
// parameters for r-cord lite
optional int32 c_tag = 12 [null = True, db_index = False, blank = False];
+ optional int32 s_tag = 19 [null = True, db_index = False, blank = False];
required string onu_device = 13 [help_text = "ONUDevice serial number", null = False, db_index = False, blank = False];
optional string ip_address = 17 [help_text = "Subscriber IP Address", null = True, db_index = False, blank = False];
optional string mac_address = 18 [null = True, db_index = False, blank = False];