Merge pull request #137 from QualiSystems/dev

Release 7.0.0

Author: Costya-Y

.github/workflows/check-version.yml

@@ -0,0 +1,10 @@
+name: check version
+on:
+  pull_request:
+    paths-ignore:
+      - README.md
+    branches:
+      - master
+jobs:
+  check-version:
+    uses: QualiSystems/.github/.github/workflows/package-check-version.yml@master

.github/workflows/deploy-package.yml

@@ -0,0 +1,11 @@
+name: deploy package
+on:
+  release:
+    types: [ published ]
+jobs:
+  tox-ci:
+    uses: QualiSystems/.github/.github/workflows/package-tox-py-37-39.yml@master
+  pypi-deploy:
+    needs: tox-ci
+    uses: QualiSystems/.github/.github/workflows/package-deploy-pypi.yml@master
+    secrets: inherit

.github/workflows/github-release.yml

@@ -0,0 +1,13 @@
+name: github release
+on:
+  push:
+    paths-ignore:
+      - README.md
+    branches:
+      - master
+jobs:
+  tox-ci:
+    uses: QualiSystems/.github/.github/workflows/package-tox-py-37-39.yml@master
+  pypi-deploy:
+    needs: tox-ci
+    uses: QualiSystems/.github/.github/workflows/package-github-release.yml@master

.github/workflows/package.yml

@@ -0,0 +1,10 @@
+name: package CI
+on:
+  push:
+    paths-ignore:
+      - README.md
+    branches-ignore:
+      - master
+jobs:
+  tox-ci:
+    uses: QualiSystems/.github/.github/workflows/package-tox-py-37-39.yml@master

.github/workflows/py2-py3-packages-ci.yml

@@ -70,3 +70,6 @@ tests/networking/cisco/autoload/autoload_structure.py
 
 .idea/
 /tests/integration
+
+/integration_tests
+/bkp-mib

.gitignore

@@ -1,18 +1,21 @@
 repos:
-  - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.21
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.3.1
+    hooks:
+      - id: pyupgrade
+        args:
+          - "--py37-plus"
+  - repo: https://github.com/timothycrosley/isort
+    rev: 5.12.0
     hooks:
       - id: isort
-        language_version: python3.7
-        exclude: '/mibs'
   - repo: https://github.com/python/black
-    rev: 19.3b0
+    rev: 23.3.0
     hooks:
       - id: black
-        language_version: python3.7
         exclude: '/mibs'
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.8
+  - repo: https://github.com/pycqa/flake8
+    rev: 5.0.4
     hooks:
       - id: flake8
         additional_dependencies: [
@@ -22,5 +25,4 @@ repos:
           flake8-print,
           flake8-eradicate,
         ]
-        language_version: python3.7
         exclude: '/mibs'

.pre-commit-config.yaml

@@ -1,4 +1,5 @@
 include *.txt
 global-include *.csv
 global-include *.ini
+global-include *.json
 prune .tox

MANIFEST.in

@@ -1,16 +1,38 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
+from functools import lru_cache
+
 from cloudshell.snmp.autoload.generic_snmp_autoload import GenericSNMPAutoload
 
-from cloudshell.networking.cisco.autoload.cisco_if_table import CiscoIfTable
+from cloudshell.networking.cisco.autoload.snmp_tables.cisco_snmp_port_table import (
+    CiscoSnmpPortsTable,
+)
+from cloudshell.networking.cisco.autoload.table_services.cisco_ports_table import (
+    CiscoPortsTable,
+)
+from cloudshell.networking.cisco.autoload.table_services.cisco_sys_info_table import (
+    CiscoSnmpSystemInfo,
+)
 
 
 class CiscoGenericSNMPAutoload(GenericSNMPAutoload):
     @property
-    def if_table_service(self):
-        if not self._if_table:
-            self._if_table = CiscoIfTable(
-                snmp_handler=self.snmp_handler, logger=self.logger
-            )
+    @lru_cache()
+    def system_info_service(self) -> CiscoSnmpSystemInfo:
+        """Get system info service."""
+        return CiscoSnmpSystemInfo(self.snmp_handler, self.logger)
+
+    @property
+    @lru_cache()
+    def port_snmp_table(self) -> CiscoSnmpPortsTable:
+        """Get port snmp table."""
+        return CiscoSnmpPortsTable(snmp_handler=self.snmp_handler, logger=self.logger)
 
-        return self._if_table
+    @property
+    def port_table_service(self) -> CiscoPortsTable:
+        """Get port table service."""
+        if not self._port_table_service:
+            self._port_table_service = CiscoPortsTable(
+                resource_model=self._resource_model,
+                ports_snmp_table=self.port_snmp_table,
+                logger=self.logger,
+            )
+        return self._port_table_service