diff --git a/moler/cmd/at/get_apns.py b/moler/cmd/at/get_apns.py index 19ade1d48..e7236b87e 100644 --- a/moler/cmd/at/get_apns.py +++ b/moler/cmd/at/get_apns.py @@ -70,9 +70,10 @@ def on_new_line(self, line, is_full_line): return super(GetApns, self).on_new_line(line, is_full_line) # +CGDCONT: 1,"IPV4V6","apnscp1","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,0 + # +CGDCONT: 1,"IPV4V6","apn1-ips-05","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,0,,,,,,,,,"",,,,0 _re_apn = re.compile( r"^\s*\+CGDCONT\:\s(?P([0-9]+)),\"(?P(IP(V4V6)?))\",\"" - '(?P([a-zA-Z0-9]*))".*$' + '(?P([a-zA-Z0-9-]*))".*$' ) def _parse_apns(self, line): @@ -114,6 +115,7 @@ def _parse_apns(self, line): +CGDCONT: 3,"IPV4V6","ims","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,0 +CGDCONT: 4,"IPV4V6","sos","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,1 +CGDCONT: 5,"IPV4V6","xcap","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,0 ++CGDCONT: 6,"IPV4V6","apn1-ips-05","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,0,,,,,,,,,"",,,,0 OK """ @@ -126,6 +128,7 @@ def _parse_apns(self, line): {"apn_num": "3", "apn_ip_name": "IPV4V6", "apn_name": "ims"}, {"apn_num": "4", "apn_ip_name": "IPV4V6", "apn_name": "sos"}, {"apn_num": "5", "apn_ip_name": "IPV4V6", "apn_name": "xcap"}, + {"apn_num": "6", "apn_ip_name": "IPV4V6", "apn_name": "apn1-ips-05"}, ] COMMAND_OUTPUT_ip = """