commit 62829b09d1ccdb1e3babd96337fe709c16c7de8e
author Scott Baker <smbaker@gmail.com> Mon Oct 23 11:16:49 2017 -0700
committer Scott Baker <scottb@onlab.us> Mon Oct 30 10:19:40 2017 -0700
tree fcf19c415f79e8451786377d3fc5c553c771e919
parent f62e9facbdbbd14e35f4784454c3be3725b86932

CORD-1951: backport recent vEG changes to vSG

Change-Id: I3086098ab507c900ba5f8a859aa51e486b16cbfa
(cherry picked from commit 690a9a472b842d3516e5cc1272557210c9ae2042)

xos/synchronizer/steps/sync_vsgserviceinstance.py

diff --git a/xos/synchronizer/steps/sync_vsgserviceinstance.py b/xos/synchronizer/steps/sync_vsgserviceinstance.py
index b063065..21cf96e 100644
--- a/xos/synchronizer/steps/sync_vsgserviceinstance.py
+++ b/xos/synchronizer/steps/sync_vsgserviceinstance.py
@@ -89,7 +89,7 @@
         safe_macs=[]
         if vsg_service.url_filter_kind == "safebrowsing":
             if o.volt and o.volt.subscriber:
-                for user in o.volt.subscriber.devices:
+                for user in o.volt.subscriber.devices and hasattr(o.volt.subscriber, "devices"):
                     level = user.get("level",None)
                     mac = user.get("mac",None)
                     if level in ["G", "PG"]:
@@ -115,8 +115,18 @@
                 "dns_servers": [x.strip() for x in vsg_service.dns_servers.split(",")],
                 "url_filter_kind": vsg_service.url_filter_kind }
 
-        # add in the sync_attributes that come from the SubscriberRoot object
+        # Some subscriber models may not implement all fields that we look for, so specify some defaults.
+        fields["firewall_rules"] = ""
+        fields["firewall_enable"] = False
+        fields["url_filter_enable"] = False
+        fields["url_filter_level"] = "PG"
+        fields["cdn_enable"] = False
+        fields["uplink_speed"] = 1000000000
+        fields["downlink_speed"] = 1000000000
+        fields["enable_uverse"] = True
+        fields["status"] = "enabled"
 
+        # add in the sync_attributes that come from the subscriber object
         if o.volt and o.volt.subscriber and hasattr(o.volt.subscriber, "sync_attributes"):
             for attribute_name in o.volt.subscriber.sync_attributes:
                 fields[attribute_name] = getattr(o.volt.subscriber, attribute_name)