cvproxy 1.0.7__tar.gz → 1.6.2__tar.gz

{cvproxy-1.0.7 → cvproxy-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cvproxy
-Version: 1.0.7
+Version: 1.6.2
 Summary: CVProxy - CloudVision Proxy
 Author-email: Chris Mason <chris@netnix.org>
 License-Expression: MIT
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyavd<6
+Requires-Dist: pyavd~=6.2.0
 Requires-Dist: jsonschema
 Dynamic: license-file
 

{cvproxy-1.0.7 → cvproxy-1.6.2}/cvproxy/__init__.py

@@ -21,12 +21,12 @@ from http.server import HTTPServer, BaseHTTPRequestHandler, HTTPStatus
 
 from pyavd._cv.client import CVClient
 from pyavd._cv.workflows.deploy_to_cv import deploy_to_cv
-from pyavd._cv.workflows.models import CloudVision, CVDevice, CVEosConfig, CVDeviceTag, CVChangeControl
+from pyavd._cv.workflows.models import CloudVision, CVDevice, CVEosConfig, CVDeviceTag, CVChangeControl, CVDeviceDeployment
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 logging.getLogger().setLevel(logging.ERROR)
 
-__version__ = '1.0.7'
+__version__ = '1.6.2'
 
 schema = {
   'unevaluatedProperties': False,
@@ -60,8 +60,8 @@ schema = {
 
 llock = threading.RLock()
 
-async def deploy(cv, configs, device_tags=[], change_control=False, strict_tags=False, delete_workspace=False):
-  r = await deploy_to_cv(cloudvision=cv, configs=configs, change_control=change_control, device_tags=device_tags, strict_tags=strict_tags)
+async def deploy(cv, device_deployments, change_control=False, strict_tags=False, delete_workspace=False):
+  r = await deploy_to_cv(change_control=change_control, cloudvision=cv, device_deployments=device_deployments, strict_tags=strict_tags)
 
   if delete_workspace and r.workspace.id and r.workspace.state == 'submitted':
     async with CVClient(servers=cv.servers, token=cv.token, username=cv.username, password=cv.password, verify_certs=cv.verify_certs) as cv_client:
@@ -101,7 +101,8 @@ class CVProxyRequest(BaseHTTPRequestHandler):
     self.status = None
 
     try:
-      config_objects = []
+      device_deployments = []
+      tmp_files = []
 
       if 'Content-Length' in self.headers:
         postdata = self.rfile.read(int(self.headers['Content-Length']))
@@ -116,7 +117,11 @@ class CVProxyRequest(BaseHTTPRequestHandler):
             token = data['cv_token'],
             username = None,
             password = None,
-            verify_certs = False
+            verify_certs = False,
+            proxy_host = None,
+            proxy_port = None,
+            proxy_username = None,
+            proxy_password = None
           )
 
           change_control = CVChangeControl(
@@ -133,9 +138,11 @@ class CVProxyRequest(BaseHTTPRequestHandler):
 
             with tempfile.NamedTemporaryFile(delete=False) as tmp:
               tmp.write(base64.b64decode(data['devices'][device]['configlet'], validate=True))
-              config_objects.append(CVEosConfig(file=tmp.name, device=device_object, configlet_name=f'AVD-{device}'))
+              eos_config = CVEosConfig(file=tmp.name, device=device_object, configlet_name=f'AVD-{device}')
+              device_deployments.append(CVDeviceDeployment(device=device_object, eos_config=eos_config, device_tags=device_tags, interface_tags=[]))
+              tmp_files.append(tmp.name)
 
-          r = asyncio.run(deploy(cloudvision, config_objects, device_tags, change_control, strict_tags=data.get('cv_strict_tags'), delete_workspace=data.get('cv_delete_workspace')))
+          r = asyncio.run(deploy(cloudvision, device_deployments, change_control, strict_tags=data.get('cv_strict_tags'), delete_workspace=data.get('cv_delete_workspace')))
 
           if r.failed:
             r.errors = [str(error) for error in r.errors]
@@ -164,8 +171,8 @@ class CVProxyRequest(BaseHTTPRequestHandler):
       r = ['application/json', 200, json.dumps(response, indent=2)]
 
     finally:
-      for config_object in config_objects:
-        os.remove(config_object.file)
+      for f in tmp_files:
+        os.remove(f)
 
     if r[0] == 'application/json':
       self.status = response['status']

{cvproxy-1.0.7 → cvproxy-1.6.2}/cvproxy/cvproxy.py

@@ -21,12 +21,12 @@ from http.server import HTTPServer, BaseHTTPRequestHandler, HTTPStatus
 
 from pyavd._cv.client import CVClient
 from pyavd._cv.workflows.deploy_to_cv import deploy_to_cv
-from pyavd._cv.workflows.models import CloudVision, CVDevice, CVEosConfig, CVDeviceTag, CVChangeControl
+from pyavd._cv.workflows.models import CloudVision, CVDevice, CVEosConfig, CVDeviceTag, CVChangeControl, CVDeviceDeployment
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 logging.getLogger().setLevel(logging.ERROR)
 
-__version__ = '1.0.7'
+__version__ = '1.6.2'
 
 schema = {
   'unevaluatedProperties': False,
@@ -60,8 +60,8 @@ schema = {
 
 llock = threading.RLock()
 
-async def deploy(cv, configs, device_tags=[], change_control=False, strict_tags=False, delete_workspace=False):
-  r = await deploy_to_cv(cloudvision=cv, configs=configs, change_control=change_control, device_tags=device_tags, strict_tags=strict_tags)
+async def deploy(cv, device_deployments, change_control=False, strict_tags=False, delete_workspace=False):
+  r = await deploy_to_cv(change_control=change_control, cloudvision=cv, device_deployments=device_deployments, strict_tags=strict_tags)
 
   if delete_workspace and r.workspace.id and r.workspace.state == 'submitted':
     async with CVClient(servers=cv.servers, token=cv.token, username=cv.username, password=cv.password, verify_certs=cv.verify_certs) as cv_client:
@@ -101,7 +101,8 @@ class CVProxyRequest(BaseHTTPRequestHandler):
     self.status = None
 
     try:
-      config_objects = []
+      device_deployments = []
+      tmp_files = []
 
       if 'Content-Length' in self.headers:
         postdata = self.rfile.read(int(self.headers['Content-Length']))
@@ -116,7 +117,11 @@ class CVProxyRequest(BaseHTTPRequestHandler):
             token = data['cv_token'],
             username = None,
             password = None,
-            verify_certs = False
+            verify_certs = False,
+            proxy_host = None,
+            proxy_port = None,
+            proxy_username = None,
+            proxy_password = None
           )
 
           change_control = CVChangeControl(
@@ -133,9 +138,11 @@ class CVProxyRequest(BaseHTTPRequestHandler):
 
             with tempfile.NamedTemporaryFile(delete=False) as tmp:
               tmp.write(base64.b64decode(data['devices'][device]['configlet'], validate=True))
-              config_objects.append(CVEosConfig(file=tmp.name, device=device_object, configlet_name=f'AVD-{device}'))
+              eos_config = CVEosConfig(file=tmp.name, device=device_object, configlet_name=f'AVD-{device}')
+              device_deployments.append(CVDeviceDeployment(device=device_object, eos_config=eos_config, device_tags=device_tags, interface_tags=[]))
+              tmp_files.append(tmp.name)
 
-          r = asyncio.run(deploy(cloudvision, config_objects, device_tags, change_control, strict_tags=data.get('cv_strict_tags'), delete_workspace=data.get('cv_delete_workspace')))
+          r = asyncio.run(deploy(cloudvision, device_deployments, change_control, strict_tags=data.get('cv_strict_tags'), delete_workspace=data.get('cv_delete_workspace')))
 
           if r.failed:
             r.errors = [str(error) for error in r.errors]
@@ -164,8 +171,8 @@ class CVProxyRequest(BaseHTTPRequestHandler):
       r = ['application/json', 200, json.dumps(response, indent=2)]
 
     finally:
-      for config_object in config_objects:
-        os.remove(config_object.file)
+      for f in tmp_files:
+        os.remove(f)
 
     if r[0] == 'application/json':
       self.status = response['status']

{cvproxy-1.0.7 → cvproxy-1.6.2}/cvproxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cvproxy
-Version: 1.0.7
+Version: 1.6.2
 Summary: CVProxy - CloudVision Proxy
 Author-email: Chris Mason <chris@netnix.org>
 License-Expression: MIT
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyavd<6
+Requires-Dist: pyavd~=6.2.0
 Requires-Dist: jsonschema
 Dynamic: license-file
 

cvproxy-1.6.2/cvproxy.egg-info/requires.txt

@@ -0,0 +1,2 @@
+pyavd~=6.2.0
+jsonschema

{cvproxy-1.0.7 → cvproxy-1.6.2}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "cvproxy"
 dynamic = ["version"]
 requires-python = ">= 3.10"
-dependencies = ["pyavd<6", "jsonschema"]
+dependencies = ["pyavd~=6.2.0", "jsonschema"]
 authors = [{ name = "Chris Mason", email = "chris@netnix.org" }]
 description = "CVProxy - CloudVision Proxy"
 readme = "README.md"

cvproxy-1.0.7/cvproxy.egg-info/requires.txt

@@ -1,2 +0,0 @@
-pyavd<6
-jsonschema