ga-api-client 0.2.16__tar.gz → 0.3.1__tar.gz

{ga-api-client-0.2.16/ga_api_client.egg-info → ga-api-client-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ga-api-client
-Version: 0.2.16
+Version: 0.3.1
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{ga-api-client-0.2.16 → ga-api-client-0.3.1}/ga_api/ga_api_client.py

@@ -8,7 +8,6 @@ import getpass
 import json
 import logging
 import math
-import http
 from async_timeout import timeout
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes # 36.0.0
 import aiohttp # 3.8.1
@@ -113,6 +112,8 @@ class Client:
             # TODO: if url is wrong, the result might not be JSON
             bringup = await resp.json()
         # do captcha when enabled
+        if bringup['tenantID'] is not None:
+            self.tenantID = bringup['tenantID']
         if bringup['captchaEnabled']:
             logging.info(f'captcha')
             key = os.urandom(24)
@@ -205,6 +206,9 @@ class Client:
                     else:
                         logging.error(f'{method} {path} - {e}, fail')
                         raise e
+                except Exception as e:
+                    logging.error(f'{method} {path} - {e}, fail')
+                    raise e
 
 class System(Client):
     def __init__(self, url, user=None, password=None, ssl=True, retry=0, conn_timeout=30, read_timeout=300):
@@ -390,7 +394,11 @@ class Tenant(Client):
         status, rlt = await self._request('GET', '/cq/dataset', [200])
         logging.info(f'status={status} rlt={rlt}')
         return rlt
-
+    async def get_mgr_config(self, req):
+        # 200 - ok, return mgr configuration
+        status, rlt = await self._request('GET', f"/mgr/{req}", [200])
+        logging.info(f'status={status}')
+        return rlt
     async def list_all_datasets(self):
         dset_list = await self.get_all_datasets()
         return desc_dataframe(dset_list)
@@ -627,6 +635,7 @@ class Adhoc:
         try:
             rlts = await asyncio.gather(*tasks)
         except Exception as e:
+            logging.error(f'read range fail {e}')
             for task in tasks:
                 task.cancel()
             raise e
@@ -690,6 +699,7 @@ class Pipeline:
         try:
             rlts = await asyncio.gather(*tasks)
         except Exception as e:
+            logging.error(f'read range fail {e}')
             for task in tasks:
                 task.cancel()
             raise e
@@ -769,6 +779,7 @@ class Dataset:
         try:
             rlts = await asyncio.gather(*tasks)
         except Exception as e:
+            logging.error(f'patch fail {e}')
             for task in tasks:
                 task.cancel()
             raise e
@@ -796,6 +807,7 @@ class Dataset:
         try:
             rlts = await asyncio.gather(*tasks)
         except Exception as e:
+            logging.error(f'poll fail {e}')
             for task in tasks:
                 task.cancel()
             raise e
@@ -835,7 +847,198 @@ class Dataset:
             finally:
                 if add_delta:
                     next_ts += delta
+class Controller:
+    def __init__(self, cid, tenant):
+        self.cid = cid
+        self._tenant = tenant
+    def desc_resource(self, rlt):
+        dict = {}
+        for i in rlt:
+            item = i.copy()
+            item.pop('tenant', None)
+            item.pop('rawConfig', None)
+            item.pop('devices', None)
+            dict[item["_id"]] = item
+            # item.pop('_id', group.None)
+        return pd.DataFrame.from_dict(dict, orient='index')
+    def desc_resource_group(self, rlt):
+        lst = []
+        for i in rlt:
+            for m in i["member"]:
+                lst.append([i["_id"], i["name"],m])
+            # item.pop('_id', None)
+        return pd.DataFrame(lst, columns =['_id', 'name', 'resource'])
+
+    async def list_interface(self):
+        """List all interface of controller
+
+        Returns:
+            pandas.DataFrane: interface indexed by tag
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.interface'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource(rlt)
+    async def list_home(self):
+        """List all home of controller
+
+        Returns:
+            pandas.DataFrane: home indexed by tag
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.home'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource(rlt)
+    async def list_router(self):
+        """List all router of controller
+
+        Returns:
+            pandas.DataFrane: router indexed by tag
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.router'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource(rlt)
+    async def list_boundary(self):
+        """List all boundary of controller
+
+        Returns:
+            pandas.DataFrane: boundary indexed by tag
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.boundary'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource(rlt)
+    async def list_neighbor(self):
+        """List all neighbor of controller
+
+        Returns:
+            pandas.DataFrane: neighbor indexed by tag
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.neighbor'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource(rlt)
+    async def list_subnetwork(self):
+        """List all subnetwork of controller
+
+        Returns:
+            pandas.DataFrane: subnetwork indexed by tag
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.subnetwork'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource(rlt)
+    async def list_serverfarm(self):
+        """List all serverfarm of controller
+
+        Returns:
+            pandas.DataFrane: serverfarm indexed by tag
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.serverfarm'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource(rlt)
+    async def list_vpn(self):
+        """List all vpn of controller
+
+        Returns:
+            pandas.DataFrane: vpn indexed by tag
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.vpnCustomer'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource(rlt)
+    async def list_pop(self):
+        """List all pop of controller
+
+        Returns:
+            pandas.DataFrane: pop indexed by tag
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.pop'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource(rlt)
+    async def list_interface_group(self):
+        """List all interface_group of controller
 
+        Returns:
+            pandas.DataFrane: interface groups indexed by group ID
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.group.interface'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource_group(rlt)
+    async def list_router_group(self):
+        """List all router_group of controller
+
+        Returns:
+            pandas.DataFrane: router groups indexed by group ID
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.group.router'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource_group(rlt)
+    async def list_boundary_group(self):
+        """List all boundary_group of controller
+
+        Returns:
+            pandas.DataFrane: boundary groups indexed by group ID
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.group.boundary'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource_group(rlt)
+    async def list_neighbor_group(self):
+        """List all neighbor_group of controller
+
+        Returns:
+            pandas.DataFrane: neighbor groups indexed by group ID
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.group.neighbor'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource_group(rlt)
+    async def list_subnetwork_group(self):
+        """List all subnetwork_group of controller
+
+        Returns:
+            pandas.DataFrane: subnetwork groups indexed by group ID
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.group.subnetwork'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource_group(rlt)
+    async def list_serverfarm_group(self):
+        """List all serverfarm_group of controller
+
+        Returns:
+            pandas.DataFrane: serverfarm groups indexed by group ID
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.group.serverfarm'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource_group(rlt)
+    async def list_vpn_group(self):
+        """List all vpn_group of controller
+
+        Returns:
+            pandas.DataFrane: vpn groups indexed by group ID
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.group.vpnCustomer'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource_group(rlt)
+    async def list_pop_group(self):
+        """List all pop_group of controller
+
+        Returns:
+            pandas.DataFrane: pop groups indexed by group ID
+        """
+        now = datetime.datetime.now().timestamp
+        req = f'tenant.{self._tenant.tenantID}.intern.atmC.{self.cid}.sync.group.pop'
+        rlt = await self._tenant.get_mgr_config(req)
+        return self.desc_resource_group(rlt)
 class Repository:
     def __init__(self, url, user=None, tenant=None, password=None, ssl=True, burst=1, retry=0, conn_timeout=30, read_timeout=300):
         """Construct repository object to send tenant requests to API server
@@ -857,7 +1060,35 @@ class Repository:
         """
         await self._tenant.close()
         await asyncio.sleep(0.250)
+    async def list_controller(self):
+        """List all controllers
 
+        Returns:
+            pandas.DataFrame: Dataset configurations indexed by id.
+        """
+        now = datetime.datetime.now().timestamp()
+        req_path = f'tenant.{self._tenant.tenantID}.intern.atmC?ts={now}'
+        controller_list = await self._tenant.get_mgr_config(req_path)
+        controller_dict = {}
+        for controller in controller_list:
+            item = controller.copy()
+            item.pop('sync', None)
+            item['version'] = item['setting']['version']
+            item['host'] = item['setting']['rest']['host']
+            item.pop('setting', None)
+            item.pop('keepUnsync', None)
+            controller_dict[item['_id']] = item
+            item.pop('_id', None)
+        return pd.DataFrame.from_dict(controller_dict, orient='index')
+    async def controller(self, cid):
+        """List all controllers
+        Args:
+            cid: the controller ID
+
+        Returns:
+            Controller object with the specified id.
+        """
+        return Controller(cid, self._tenant)
     async def list(self):
         """List all datasets
 

{ga-api-client-0.2.16 → ga-api-client-0.3.1/ga_api_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ga-api-client
-Version: 0.2.16
+Version: 0.3.1
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{ga-api-client-0.2.16 → ga-api-client-0.3.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ga-api-client
-version = 0.2.16
+version = 0.3.1
 long_description = file: README.md
 long_description_content_type = text/markdown
 classifiers =