Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/routing/static/__init__.py
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/routing/static/__init__.py	(revision 38723)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/routing/static/__init__.py	(working copy)
@@ -23,19 +23,22 @@
     class Manager(CLIManager):
         def _get_query_set(self):
             self.cli.set_enable(force=True)
-            sess = get_current_session()
-            if sess.is_segment_user:
-                parser = RegexParser('segment ip route default (?P<gateway_ip_str>[0-9|:|\.|\w]+)\s+%s' % sess.segment_name, MATCHALL, reflags=re.S)
-            else:
-                parser = RegexParser('ip route default (?P<gateway_ip_str>[0-9|:|\.|\w]+)\s+\n', MATCHALL, reflags=re.S)
-            result = self.cli.cmd('show run route', parser)
+            result = self.cli.cmd('show ip route')
+            ipv4_res = cli_parse(result,
+                                RegexParser('IPv4 route:(.*?)(?=IPv6 route:|management route:|$)', MATCHALL, reflags=re.S))
+            ipv6_res = cli_parse(result,
+                                RegexParser('IPv6 route:(.*?)(?=management route:|$)', MATCHALL, reflags=re.S))
             ret = {'gateway_ip': {'ipv4': '', 'ipv6': ''}}
-            if result:
-                for each_res in result:
-                    if is_ipv4(each_res['gateway_ip_str']):
-                        ret['gateway_ip']['ipv4'] = each_res['gateway_ip_str']
-                    elif is_ipv6(each_res['gateway_ip_str']):
-                        ret['gateway_ip']['ipv6'] = each_res['gateway_ip_str']
+            for content in ipv4_res:
+                if "default" in content[0]:
+                    ipv4_check = cli_parse(content[0],
+                                            RegexParser('default\s+\s*(\S+)', MATCHALL, reflags=re.S))
+                    ret['gateway_ip']['ipv4'] = ipv4_check[0][0]
+            for content in ipv6_res:
+                if "default" in content[0]:
+                    ipv6_check = cli_parse(content[0],
+                                            RegexParser('default\s+\s*(\S+)', MATCHALL, reflags=re.S))
+                    ret['gateway_ip']['ipv6'] = ipv6_check[0][0]
             data = QuerySet(self._model, [ret])
             return data
             
