From 05ef5b078cd534e50879e39266138b779d209705 Mon Sep 17 00:00:00 2001 From: brent s Date: Fri, 15 May 2020 01:45:52 -0400 Subject: [PATCH] getting there --- utils/he_ipv6/tunnel.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/he_ipv6/tunnel.py b/utils/he_ipv6/tunnel.py index ad67f41..100f26a 100644 --- a/utils/he_ipv6/tunnel.py +++ b/utils/he_ipv6/tunnel.py @@ -112,6 +112,7 @@ class Tunnel(object): self.id = None self.client = None self.server = None + self.endpoint = None self.radvd = None self.enable_radvd = None self.radvd_dns = None @@ -135,16 +136,17 @@ class Tunnel(object): return(None) def _client(self): - _client_xml = self.xml.find('client') - _ip_txt = _client_xml.text.strip() - _prefix_txt = _client_xml.attrib['prefix'].strip() - self.client = IP6(_ip_txt, _prefix_txt) + self.client = self.he.client return(None) def _creds(self): self.creds_id = self.xml.attrib['creds'].strip() return(None) + def _endpoint(self): + self.endpoint = self.he.endpoint + return(None) + def _id(self): self.id = int(self.xml.attrib['id'].strip()) return(None) @@ -155,9 +157,7 @@ class Tunnel(object): return(None) def _server(self): - _server_xml = self.xml.find('server') - _ip_text = _server_xml.text.strip() - self.server = IP4(_ip_text, 32) + self.server = self.he.server return(None) def parse(self):