Skip to content

Minor sanity fixes #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LarryLaffer-dev wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −4
Open

Minor sanity fixes #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2144,6 +2144,10 @@ def Update_Serving_APN(self, imsi, apn, pcrf_session_id, serving_pgw, subscriber
assert(len(serving_pgw) > 0)
assert("None" not in serving_pgw)

if ServingAPN and ((subscriber_routing == "None") or (subscriber_routing == "") or (subscriber_routing == "Failed to Decode / Get UE IP") or (subscriber_routing == None)):
json_data['subscriber_routing'] = ServingAPN['subscriber_routing']
self.logTool.log(service='Database', level='debug', message="Using existing subscriber routing from Serving APN", redisClient=self.redisMessaging)

self.UpdateObj(SERVING_APN, json_data, ServingAPN['serving_apn_id'], True)
objectData = self.GetObj(SERVING_APN, ServingAPN['serving_apn_id'])
self.handleWebhook(objectData, 'PATCH')
Expand Down
17 changes: 13 additions & 4 deletions lib/diameter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3756,10 +3756,19 @@ def Answer_16777236_265(self, packet_vars, avps):
servingApn = remoteServingApn
else:
servingApn = self.database.Get_Serving_APN(subscriber_id=subscriberId, apn_id=apnId)
servingPgwPeer = servingApn.get('serving_pgw_peer', None).split(';')[0]
servingPgw = servingApn.get('serving_pgw', None)
servingPgwRealm = servingApn.get('serving_pgw_realm', None)
pcrfSessionId = servingApn.get('pcrf_session_id', None)

if servingApn:
self.logTool.log(service='HSS', level='debug', message=f"[diameter.py] [Answer_16777236_265] [AAA] Found Serving APN for subscriberId: {subscriberId} and apnId: {apnId}", redisClient=self.redisMessaging)
servingPgwPeer = servingApn.get('serving_pgw_peer', None).split(';')[0]
servingPgw = servingApn.get('serving_pgw', None)
servingPgwRealm = servingApn.get('serving_pgw_realm', None)
pcrfSessionId = servingApn.get('pcrf_session_id', None)
else:
servingPgwPeer = None
servingPgw = None
servingPgwRealm = None
pcrfSessionId = None
raise Exception("No Serving APN found")

if not ueIp:
ueIp = servingApn.get('subscriber_routing', None)
Expand Down