From 3a79bba56242982934eb2a889f4565e493455aee Mon Sep 17 00:00:00 2001 From: CamoDunn Date: Wed, 6 Apr 2022 21:35:51 -0500 Subject: [PATCH 1/2] Changed References from folder structure to package.path - pyinstaller support Changes: 1. Updated Meraki and Meraki_v0 to look back at package for reference instead of backing through folder structure. This will provide support for pyinstaller. Updated Example "apiData2CSV_v1.py" It was still looking for package meraki_v1 which has been renamed to meraki. --- examples/apiData2CSV_v1.py | 4 +- meraki/__init__.py | 28 +++--- meraki/aio/__init__.py | 28 +++--- meraki/aio/rest_session.py | 8 +- meraki/api/batch/__init__.py | 22 ++--- meraki/rest_session.py | 6 +- meraki_v0/__init__.py | 158 +++++++++++++++++----------------- meraki_v0/aio/__init__.py | 156 ++++++++++++++++----------------- meraki_v0/aio/rest_session.py | 8 +- meraki_v0/rest_session.py | 6 +- 10 files changed, 212 insertions(+), 212 deletions(-) diff --git a/examples/apiData2CSV_v1.py b/examples/apiData2CSV_v1.py index c962f44a..23df82b2 100644 --- a/examples/apiData2CSV_v1.py +++ b/examples/apiData2CSV_v1.py @@ -5,7 +5,7 @@ import argparse import sys -import meraki_v1 +import meraki import urllib.parse import platform @@ -29,7 +29,7 @@ def main(org_id, timespan): # Instantiate a Meraki dashboard API session - dashboard = meraki_v1.DashboardAPI( + dashboard = meraki.DashboardAPI( base_url='https://api.meraki.com/api/v1/', print_console=False, output_log=False, diff --git a/meraki/__init__.py b/meraki/__init__.py index b70a944c..47a4fbab 100644 --- a/meraki/__init__.py +++ b/meraki/__init__.py @@ -2,24 +2,24 @@ import logging import os -from .rest_session import * -from .api.organizations import Organizations -from .api.networks import Networks -from .api.devices import Devices -from .api.appliance import Appliance -from .api.camera import Camera -from .api.cellularGateway import CellularGateway -from .api.insight import Insight -from .api.sensor import Sensor -from .api.sm import Sm -from .api.switch import Switch -from .api.wireless import Wireless +from meraki.rest_session import * +from meraki.api.organizations import Organizations +from meraki.api.networks import Networks +from meraki.api.devices import Devices +from meraki.api.appliance import Appliance +from meraki.api.camera import Camera +from meraki.api.cellularGateway import CellularGateway +from meraki.api.insight import Insight +from meraki.api.sensor import Sensor +from meraki.api.sm import Sm +from meraki.api.switch import Switch +from meraki.api.wireless import Wireless # Batch class imports -from .api.batch import Batch +from meraki.api.batch import Batch # Config import -from .config import ( +from meraki.config import ( API_KEY_ENVIRONMENT_VARIABLE, DEFAULT_BASE_URL, SINGLE_REQUEST_TIMEOUT, diff --git a/meraki/aio/__init__.py b/meraki/aio/__init__.py index 4b19e8be..01c5792c 100644 --- a/meraki/aio/__init__.py +++ b/meraki/aio/__init__.py @@ -2,24 +2,24 @@ import os from datetime import datetime -from .rest_session import * -from .api.appliance import AsyncAppliance -from .api.camera import AsyncCamera -from .api.cellularGateway import AsyncCellularGateway -from .api.devices import AsyncDevices -from .api.insight import AsyncInsight -from .api.networks import AsyncNetworks -from .api.organizations import AsyncOrganizations -from .api.sensor import AsyncSensor -from .api.sm import AsyncSm -from .api.switch import AsyncSwitch -from .api.wireless import AsyncWireless +from meraki.aio.rest_session import * +from meraki.aio.api.appliance import AsyncAppliance +from meraki.aio.api.camera import AsyncCamera +from meraki.aio.api.cellularGateway import AsyncCellularGateway +from meraki.aio.api.devices import AsyncDevices +from meraki.aio.api.insight import AsyncInsight +from meraki.aio.api.networks import AsyncNetworks +from meraki.aio.api.organizations import AsyncOrganizations +from meraki.aio.api.sensor import AsyncSensor +from meraki.aio.api.sm import AsyncSm +from meraki.aio.api.switch import AsyncSwitch +from meraki.aio.api.wireless import AsyncWireless # Batch class imports -from ..api.batch import Batch +from meraki.api.batch import Batch # Config import -from ..config import ( +from meraki.config import ( API_KEY_ENVIRONMENT_VARIABLE, DEFAULT_BASE_URL, SINGLE_REQUEST_TIMEOUT, diff --git a/meraki/aio/rest_session.py b/meraki/aio/rest_session.py index 4fee4e69..4da450a0 100644 --- a/meraki/aio/rest_session.py +++ b/meraki/aio/rest_session.py @@ -9,10 +9,10 @@ import aiohttp -from ..__init__ import __version__ -from ..config import * -from ..exceptions import * -from ..rest_session import user_agent_extended +from meraki.__init__ import __version__ +from meraki.config import * +from meraki.exceptions import * +from meraki.rest_session import user_agent_extended # Main module interface diff --git a/meraki/api/batch/__init__.py b/meraki/api/batch/__init__.py index 3f0ef9a9..86549468 100644 --- a/meraki/api/batch/__init__.py +++ b/meraki/api/batch/__init__.py @@ -1,14 +1,14 @@ -from .organizations import ActionBatchOrganizations -from .networks import ActionBatchNetworks -from .devices import ActionBatchDevices -from .appliance import ActionBatchAppliance -from .camera import ActionBatchCamera -from .cellularGateway import ActionBatchCellularGateway -from .insight import ActionBatchInsight -from .sensor import ActionBatchSensor -from .sm import ActionBatchSm -from .switch import ActionBatchSwitch -from .wireless import ActionBatchWireless +from meraki.api.batch.organizations import ActionBatchOrganizations +from meraki.api.batch.networks import ActionBatchNetworks +from meraki.api.batch.devices import ActionBatchDevices +from meraki.api.batch.appliance import ActionBatchAppliance +from meraki.api.batch.camera import ActionBatchCamera +from meraki.api.batch.cellularGateway import ActionBatchCellularGateway +from meraki.api.batch.insight import ActionBatchInsight +from meraki.api.batch.sensor import ActionBatchSensor +from meraki.api.batch.sm import ActionBatchSm +from meraki.api.batch.switch import ActionBatchSwitch +from meraki.api.batch.wireless import ActionBatchWireless # Batch class diff --git a/meraki/rest_session.py b/meraki/rest_session.py index 7477c461..8d6acc9d 100644 --- a/meraki/rest_session.py +++ b/meraki/rest_session.py @@ -8,9 +8,9 @@ import requests -from .config import * -from .exceptions import * -from .__init__ import __version__ +from meraki.config import * +from meraki.exceptions import * +from meraki.__init__ import __version__ def user_agent_extended(be_geo_id, caller): diff --git a/meraki_v0/__init__.py b/meraki_v0/__init__.py index b4d18269..4a37b967 100644 --- a/meraki_v0/__init__.py +++ b/meraki_v0/__init__.py @@ -2,85 +2,85 @@ import logging import os -from .legacy import * -from .rest_session import * -from .api.api_usage import APIUsage -from .api.action_batches import ActionBatches -from .api.admins import Admins -from .api.alert_settings import AlertSettings -from .api.bluetooth_clients import BluetoothClients -from .api.bluetooth_settings import BluetoothSettings -from .api.camera_quality_retention_profiles import CameraQualityRetentionProfiles -from .api.cameras import Cameras -from .api.change_log import ChangeLog -from .api.clients import Clients -from .api.config_templates import ConfigTemplates -from .api.connectivity_monitoring_destinations import ConnectivityMonitoringDestinations -from .api.content_filtering_categories import ContentFilteringCategories -from .api.content_filtering_rules import ContentFilteringRules -from .api.dashboard_branding_policies import DashboardBrandingPolicies -from .api.devices import Devices -from .api.events import Events -from .api.firewalled_services import FirewalledServices -from .api.floor_plans import FloorPlans -from .api.group_policies import GroupPolicies -from .api.http_servers import HTTPServers -from .api.intrusion_settings import IntrusionSettings -from .api.licenses import Licenses -from .api.link_aggregations import LinkAggregations -from .api.mg_dhcp_settings import MGDHCPSettings -from .api.mg_lan_settings import MGLANSettings -from .api.mg_connectivity_monitoring_destinations import MGConnectivityMonitoringDestinations -from .api.mg_port_forwarding_rules import MGPortForwardingRules -from .api.mg_subnet_pool_settings import MGSubnetPoolSettings -from .api.mg_uplink_settings import MGUplinkSettings -from .api.mr_l3_firewall import MRL3Firewall -from .api.mv_sense import MVSense -from .api.mx_1_1_nat_rules import MX11NATRules -from .api.mx_1_many_nat_rules import MX1ManyNATRules -from .api.mx_l3_firewall import MXL3Firewall -from .api.mx_l7_application_categories import MXL7ApplicationCategories -from .api.mx_l7_firewall import MXL7Firewall -from .api.mx_vlan_ports import MXVLANPorts -from .api.mx_vpn_firewall import MXVPNFirewall -from .api.mx_cellular_firewall import MXCellularFirewall -from .api.mx_inbound_firewall import MXInboundFirewall -from .api.mx_port_forwarding_rules import MXPortForwardingRules -from .api.mx_static_routes import MXStaticRoutes -from .api.mx_warm_spare_settings import MXWarmSpareSettings -from .api.malware_settings import MalwareSettings -from .api.management_interface_settings import ManagementInterfaceSettings -from .api.meraki_auth_users import MerakiAuthUsers -from .api.monitored_media_servers import MonitoredMediaServers -from .api.named_tag_scope import NamedTagScope -from .api.netflow_settings import NetFlowSettings -from .api.networks import Networks -from .api.openapi_spec import OpenAPISpec -from .api.organizations import Organizations -from .api.pii import PII -from .api.radio_settings import RadioSettings -from .api.saml_roles import SAMLRoles -from .api.sm import SM -from .api.snmp_settings import SNMPSettings -from .api.ssids import SSIDs -from .api.security_events import SecurityEvents -from .api.splash_login_attempts import SplashLoginAttempts -from .api.splash_settings import SplashSettings -from .api.switch_acls import SwitchACLs -from .api.switch_port_schedules import SwitchPortSchedules -from .api.switch_ports import SwitchPorts -from .api.switch_profiles import SwitchProfiles -from .api.switch_settings import SwitchSettings -from .api.switch_stacks import SwitchStacks -from .api.syslog_servers import SyslogServers -from .api.traffic_analysis_settings import TrafficAnalysisSettings -from .api.traffic_shaping import TrafficShaping -from .api.uplink_settings import UplinkSettings -from .api.vlans import VLANs -from .api.webhook_logs import WebhookLogs -from .api.wireless_health import WirelessHealth -from .api.wireless_settings import WirelessSettings -from .config import ( +from meraki_v0.legacy import * +from meraki_v0.rest_session import * +from meraki_v0.api.api_usage import APIUsage +from meraki_v0.api.action_batches import ActionBatches +from meraki_v0.api.admins import Admins +from meraki_v0.api.alert_settings import AlertSettings +from meraki_v0.api.bluetooth_clients import BluetoothClients +from meraki_v0.api.bluetooth_settings import BluetoothSettings +from meraki_v0.api.camera_quality_retention_profiles import CameraQualityRetentionProfiles +from meraki_v0.api.cameras import Cameras +from meraki_v0.api.change_log import ChangeLog +from meraki_v0.api.clients import Clients +from meraki_v0.api.config_templates import ConfigTemplates +from meraki_v0.api.connectivity_monitoring_destinations import ConnectivityMonitoringDestinations +from meraki_v0.api.content_filtering_categories import ContentFilteringCategories +from meraki_v0.api.content_filtering_rules import ContentFilteringRules +from meraki_v0.api.dashboard_branding_policies import DashboardBrandingPolicies +from meraki_v0.api.devices import Devices +from meraki_v0.api.events import Events +from meraki_v0.api.firewalled_services import FirewalledServices +from meraki_v0.api.floor_plans import FloorPlans +from meraki_v0.api.group_policies import GroupPolicies +from meraki_v0.api.http_servers import HTTPServers +from meraki_v0.api.intrusion_settings import IntrusionSettings +from meraki_v0.api.licenses import Licenses +from meraki_v0.api.link_aggregations import LinkAggregations +from meraki_v0.api.mg_dhcp_settings import MGDHCPSettings +from meraki_v0.api.mg_lan_settings import MGLANSettings +from meraki_v0.api.mg_connectivity_monitoring_destinations import MGConnectivityMonitoringDestinations +from meraki_v0.api.mg_port_forwarding_rules import MGPortForwardingRules +from meraki_v0.api.mg_subnet_pool_settings import MGSubnetPoolSettings +from meraki_v0.api.mg_uplink_settings import MGUplinkSettings +from meraki_v0.api.mr_l3_firewall import MRL3Firewall +from meraki_v0.api.mv_sense import MVSense +from meraki_v0.api.mx_1_1_nat_rules import MX11NATRules +from meraki_v0.api.mx_1_many_nat_rules import MX1ManyNATRules +from meraki_v0.api.mx_l3_firewall import MXL3Firewall +from meraki_v0.api.mx_l7_application_categories import MXL7ApplicationCategories +from meraki_v0.api.mx_l7_firewall import MXL7Firewall +from meraki_v0.api.mx_vlan_ports import MXVLANPorts +from meraki_v0.api.mx_vpn_firewall import MXVPNFirewall +from meraki_v0.api.mx_cellular_firewall import MXCellularFirewall +from meraki_v0.api.mx_inbound_firewall import MXInboundFirewall +from meraki_v0.api.mx_port_forwarding_rules import MXPortForwardingRules +from meraki_v0.api.mx_static_routes import MXStaticRoutes +from meraki_v0.api.mx_warm_spare_settings import MXWarmSpareSettings +from meraki_v0.api.malware_settings import MalwareSettings +from meraki_v0.api.management_interface_settings import ManagementInterfaceSettings +from meraki_v0.api.meraki_auth_users import MerakiAuthUsers +from meraki_v0.api.monitored_media_servers import MonitoredMediaServers +from meraki_v0.api.named_tag_scope import NamedTagScope +from meraki_v0.api.netflow_settings import NetFlowSettings +from meraki_v0.api.networks import Networks +from meraki_v0.api.openapi_spec import OpenAPISpec +from meraki_v0.api.organizations import Organizations +from meraki_v0.api.pii import PII +from meraki_v0.api.radio_settings import RadioSettings +from meraki_v0.api.saml_roles import SAMLRoles +from meraki_v0.api.sm import SM +from meraki_v0.api.snmp_settings import SNMPSettings +from meraki_v0.api.ssids import SSIDs +from meraki_v0.api.security_events import SecurityEvents +from meraki_v0.api.splash_login_attempts import SplashLoginAttempts +from meraki_v0.api.splash_settings import SplashSettings +from meraki_v0.api.switch_acls import SwitchACLs +from meraki_v0.api.switch_port_schedules import SwitchPortSchedules +from meraki_v0.api.switch_ports import SwitchPorts +from meraki_v0.api.switch_profiles import SwitchProfiles +from meraki_v0.api.switch_settings import SwitchSettings +from meraki_v0.api.switch_stacks import SwitchStacks +from meraki_v0.api.syslog_servers import SyslogServers +from meraki_v0.api.traffic_analysis_settings import TrafficAnalysisSettings +from meraki_v0.api.traffic_shaping import TrafficShaping +from meraki_v0.api.uplink_settings import UplinkSettings +from meraki_v0.api.vlans import VLANs +from meraki_v0.api.webhook_logs import WebhookLogs +from meraki_v0.api.wireless_health import WirelessHealth +from meraki_v0.api.wireless_settings import WirelessSettings +from meraki_v0.config import ( API_KEY_ENVIRONMENT_VARIABLE, DEFAULT_BASE_URL, SINGLE_REQUEST_TIMEOUT, CERTIFICATE_PATH, REQUESTS_PROXY, WAIT_ON_RATE_LIMIT, NGINX_429_RETRY_WAIT_TIME, ACTION_BATCH_RETRY_WAIT_TIME, RETRY_4XX_ERROR, RETRY_4XX_ERROR_WAIT_TIME, MAXIMUM_RETRIES, OUTPUT_LOG, LOG_PATH, LOG_FILE_PREFIX, PRINT_TO_CONSOLE, diff --git a/meraki_v0/aio/__init__.py b/meraki_v0/aio/__init__.py index 31ca0268..6cca8aa7 100644 --- a/meraki_v0/aio/__init__.py +++ b/meraki_v0/aio/__init__.py @@ -2,84 +2,84 @@ import logging import os -from .rest_session import * -from .api.api_usage import AsyncAPIUsage -from .api.action_batches import AsyncActionBatches -from .api.admins import AsyncAdmins -from .api.alert_settings import AsyncAlertSettings -from .api.bluetooth_clients import AsyncBluetoothClients -from .api.bluetooth_settings import AsyncBluetoothSettings -from .api.camera_quality_retention_profiles import AsyncCameraQualityRetentionProfiles -from .api.cameras import AsyncCameras -from .api.change_log import AsyncChangeLog -from .api.clients import AsyncClients -from .api.config_templates import AsyncConfigTemplates -from .api.connectivity_monitoring_destinations import AsyncConnectivityMonitoringDestinations -from .api.content_filtering_categories import AsyncContentFilteringCategories -from .api.content_filtering_rules import AsyncContentFilteringRules -from .api.dashboard_branding_policies import AsyncDashboardBrandingPolicies -from .api.devices import AsyncDevices -from .api.events import AsyncEvents -from .api.firewalled_services import AsyncFirewalledServices -from .api.floor_plans import AsyncFloorPlans -from .api.group_policies import AsyncGroupPolicies -from .api.http_servers import AsyncHTTPServers -from .api.intrusion_settings import AsyncIntrusionSettings -from .api.licenses import AsyncLicenses -from .api.link_aggregations import AsyncLinkAggregations -from .api.mg_dhcp_settings import AsyncMGDHCPSettings -from .api.mg_lan_settings import AsyncMGLANSettings -from .api.mg_connectivity_monitoring_destinations import AsyncMGConnectivityMonitoringDestinations -from .api.mg_port_forwarding_rules import AsyncMGPortForwardingRules -from .api.mg_subnet_pool_settings import AsyncMGSubnetPoolSettings -from .api.mg_uplink_settings import AsyncMGUplinkSettings -from .api.mr_l3_firewall import AsyncMRL3Firewall -from .api.mv_sense import AsyncMVSense -from .api.mx_1_1_nat_rules import AsyncMX11NATRules -from .api.mx_1_many_nat_rules import AsyncMX1ManyNATRules -from .api.mx_l3_firewall import AsyncMXL3Firewall -from .api.mx_l7_application_categories import AsyncMXL7ApplicationCategories -from .api.mx_l7_firewall import AsyncMXL7Firewall -from .api.mx_vlan_ports import AsyncMXVLANPorts -from .api.mx_vpn_firewall import AsyncMXVPNFirewall -from .api.mx_cellular_firewall import AsyncMXCellularFirewall -from .api.mx_inbound_firewall import AsyncMXInboundFirewall -from .api.mx_port_forwarding_rules import AsyncMXPortForwardingRules -from .api.mx_static_routes import AsyncMXStaticRoutes -from .api.mx_warm_spare_settings import AsyncMXWarmSpareSettings -from .api.malware_settings import AsyncMalwareSettings -from .api.management_interface_settings import AsyncManagementInterfaceSettings -from .api.meraki_auth_users import AsyncMerakiAuthUsers -from .api.monitored_media_servers import AsyncMonitoredMediaServers -from .api.named_tag_scope import AsyncNamedTagScope -from .api.netflow_settings import AsyncNetFlowSettings -from .api.networks import AsyncNetworks -from .api.openapi_spec import AsyncOpenAPISpec -from .api.organizations import AsyncOrganizations -from .api.pii import AsyncPII -from .api.radio_settings import AsyncRadioSettings -from .api.saml_roles import AsyncSAMLRoles -from .api.sm import AsyncSM -from .api.snmp_settings import AsyncSNMPSettings -from .api.ssids import AsyncSSIDs -from .api.security_events import AsyncSecurityEvents -from .api.splash_login_attempts import AsyncSplashLoginAttempts -from .api.splash_settings import AsyncSplashSettings -from .api.switch_acls import AsyncSwitchACLs -from .api.switch_port_schedules import AsyncSwitchPortSchedules -from .api.switch_ports import AsyncSwitchPorts -from .api.switch_profiles import AsyncSwitchProfiles -from .api.switch_settings import AsyncSwitchSettings -from .api.switch_stacks import AsyncSwitchStacks -from .api.syslog_servers import AsyncSyslogServers -from .api.traffic_analysis_settings import AsyncTrafficAnalysisSettings -from .api.traffic_shaping import AsyncTrafficShaping -from .api.uplink_settings import AsyncUplinkSettings -from .api.vlans import AsyncVLANs -from .api.webhook_logs import AsyncWebhookLogs -from .api.wireless_health import AsyncWirelessHealth -from .api.wireless_settings import AsyncWirelessSettings -from ..config import ( +from meraki_v0.aio.rest_session import * +from meraki_v0.api.api_usage import AsyncAPIUsage +from meraki_v0.api.action_batches import AsyncActionBatches +from meraki_v0.api.admins import AsyncAdmins +from meraki_v0.api.alert_settings import AsyncAlertSettings +from meraki_v0.api.bluetooth_clients import AsyncBluetoothClients +from meraki_v0.api.bluetooth_settings import AsyncBluetoothSettings +from meraki_v0.api.camera_quality_retention_profiles import AsyncCameraQualityRetentionProfiles +from meraki_v0.api.cameras import AsyncCameras +from meraki_v0.api.change_log import AsyncChangeLog +from meraki_v0.api.clients import AsyncClients +from meraki_v0.api.config_templates import AsyncConfigTemplates +from meraki_v0.api.connectivity_monitoring_destinations import AsyncConnectivityMonitoringDestinations +from meraki_v0.api.content_filtering_categories import AsyncContentFilteringCategories +from meraki_v0.api.content_filtering_rules import AsyncContentFilteringRules +from meraki_v0.api.dashboard_branding_policies import AsyncDashboardBrandingPolicies +from meraki_v0.api.devices import AsyncDevices +from meraki_v0.api.events import AsyncEvents +from meraki_v0.api.firewalled_services import AsyncFirewalledServices +from meraki_v0.api.floor_plans import AsyncFloorPlans +from meraki_v0.api.group_policies import AsyncGroupPolicies +from meraki_v0.api.http_servers import AsyncHTTPServers +from meraki_v0.api.intrusion_settings import AsyncIntrusionSettings +from meraki_v0.api.licenses import AsyncLicenses +from meraki_v0.api.link_aggregations import AsyncLinkAggregations +from meraki_v0.api.mg_dhcp_settings import AsyncMGDHCPSettings +from meraki_v0.api.mg_lan_settings import AsyncMGLANSettings +from meraki_v0.api.mg_connectivity_monitoring_destinations import AsyncMGConnectivityMonitoringDestinations +from meraki_v0.api.mg_port_forwarding_rules import AsyncMGPortForwardingRules +from meraki_v0.api.mg_subnet_pool_settings import AsyncMGSubnetPoolSettings +from meraki_v0.api.mg_uplink_settings import AsyncMGUplinkSettings +from meraki_v0.api.mr_l3_firewall import AsyncMRL3Firewall +from meraki_v0.api.mv_sense import AsyncMVSense +from meraki_v0.api.mx_1_1_nat_rules import AsyncMX11NATRules +from meraki_v0.api.mx_1_many_nat_rules import AsyncMX1ManyNATRules +from meraki_v0.api.mx_l3_firewall import AsyncMXL3Firewall +from meraki_v0.api.mx_l7_application_categories import AsyncMXL7ApplicationCategories +from meraki_v0.api.mx_l7_firewall import AsyncMXL7Firewall +from meraki_v0.api.mx_vlan_ports import AsyncMXVLANPorts +from meraki_v0.api.mx_vpn_firewall import AsyncMXVPNFirewall +from meraki_v0.api.mx_cellular_firewall import AsyncMXCellularFirewall +from meraki_v0.api.mx_inbound_firewall import AsyncMXInboundFirewall +from meraki_v0.api.mx_port_forwarding_rules import AsyncMXPortForwardingRules +from meraki_v0.api.mx_static_routes import AsyncMXStaticRoutes +from meraki_v0.api.mx_warm_spare_settings import AsyncMXWarmSpareSettings +from meraki_v0.api.malware_settings import AsyncMalwareSettings +from meraki_v0.api.management_interface_settings import AsyncManagementInterfaceSettings +from meraki_v0.api.meraki_auth_users import AsyncMerakiAuthUsers +from meraki_v0.api.monitored_media_servers import AsyncMonitoredMediaServers +from meraki_v0.api.named_tag_scope import AsyncNamedTagScope +from meraki_v0.api.netflow_settings import AsyncNetFlowSettings +from meraki_v0.api.networks import AsyncNetworks +from meraki_v0.api.openapi_spec import AsyncOpenAPISpec +from meraki_v0.api.organizations import AsyncOrganizations +from meraki_v0.api.pii import AsyncPII +from meraki_v0.api.radio_settings import AsyncRadioSettings +from meraki_v0.api.saml_roles import AsyncSAMLRoles +from meraki_v0.api.sm import AsyncSM +from meraki_v0.api.snmp_settings import AsyncSNMPSettings +from meraki_v0.api.ssids import AsyncSSIDs +from meraki_v0.api.security_events import AsyncSecurityEvents +from meraki_v0.api.splash_login_attempts import AsyncSplashLoginAttempts +from meraki_v0.api.splash_settings import AsyncSplashSettings +from meraki_v0.api.switch_acls import AsyncSwitchACLs +from meraki_v0.api.switch_port_schedules import AsyncSwitchPortSchedules +from meraki_v0.api.switch_ports import AsyncSwitchPorts +from meraki_v0.api.switch_profiles import AsyncSwitchProfiles +from meraki_v0.api.switch_settings import AsyncSwitchSettings +from meraki_v0.api.switch_stacks import AsyncSwitchStacks +from meraki_v0.api.syslog_servers import AsyncSyslogServers +from meraki_v0.api.traffic_analysis_settings import AsyncTrafficAnalysisSettings +from meraki_v0.api.traffic_shaping import AsyncTrafficShaping +from meraki_v0.api.uplink_settings import AsyncUplinkSettings +from meraki_v0.api.vlans import AsyncVLANs +from meraki_v0.api.webhook_logs import AsyncWebhookLogs +from meraki_v0.api.wireless_health import AsyncWirelessHealth +from meraki_v0.api.wireless_settings import AsyncWirelessSettings +from meraki_v0.config import ( API_KEY_ENVIRONMENT_VARIABLE, DEFAULT_BASE_URL, SINGLE_REQUEST_TIMEOUT, CERTIFICATE_PATH, REQUESTS_PROXY, WAIT_ON_RATE_LIMIT, NGINX_429_RETRY_WAIT_TIME, ACTION_BATCH_RETRY_WAIT_TIME, RETRY_4XX_ERROR, RETRY_4XX_ERROR_WAIT_TIME, MAXIMUM_RETRIES, OUTPUT_LOG, LOG_PATH, LOG_FILE_PREFIX, PRINT_TO_CONSOLE, diff --git a/meraki_v0/aio/rest_session.py b/meraki_v0/aio/rest_session.py index 8b46d609..7597ee93 100644 --- a/meraki_v0/aio/rest_session.py +++ b/meraki_v0/aio/rest_session.py @@ -8,10 +8,10 @@ import aiohttp -from ..config import * -from ..exceptions import * -from ..__init__ import __version__ -from ..rest_session import user_agent_extended +from meraki_v0.config import * +from meraki_v0.exceptions import * +from meraki_v0.__init__ import __version__ +from meraki_v0.rest_session import user_agent_extended # Main module interface class AsyncRestSession: diff --git a/meraki_v0/rest_session.py b/meraki_v0/rest_session.py index 56dbb71a..dbc9d714 100644 --- a/meraki_v0/rest_session.py +++ b/meraki_v0/rest_session.py @@ -7,9 +7,9 @@ import requests -from .config import * -from .exceptions import * -from .__init__ import __version__ +from meraki_v0.config import * +from meraki_v0.exceptions import * +from meraki_v0.__init__ import __version__ def user_agent_extended(be_geo_id, caller): From 73f65197564b4bdc1cf2d73be3a14b10a9c0873b Mon Sep 17 00:00:00 2001 From: CamoDunn Date: Thu, 7 Apr 2022 16:07:16 -0500 Subject: [PATCH 2/2] Update __init__.py --- meraki_v0/aio/__init__.py | 152 +++++++++++++++++++------------------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/meraki_v0/aio/__init__.py b/meraki_v0/aio/__init__.py index 6cca8aa7..d31efe49 100644 --- a/meraki_v0/aio/__init__.py +++ b/meraki_v0/aio/__init__.py @@ -3,82 +3,82 @@ import os from meraki_v0.aio.rest_session import * -from meraki_v0.api.api_usage import AsyncAPIUsage -from meraki_v0.api.action_batches import AsyncActionBatches -from meraki_v0.api.admins import AsyncAdmins -from meraki_v0.api.alert_settings import AsyncAlertSettings -from meraki_v0.api.bluetooth_clients import AsyncBluetoothClients -from meraki_v0.api.bluetooth_settings import AsyncBluetoothSettings -from meraki_v0.api.camera_quality_retention_profiles import AsyncCameraQualityRetentionProfiles -from meraki_v0.api.cameras import AsyncCameras -from meraki_v0.api.change_log import AsyncChangeLog -from meraki_v0.api.clients import AsyncClients -from meraki_v0.api.config_templates import AsyncConfigTemplates -from meraki_v0.api.connectivity_monitoring_destinations import AsyncConnectivityMonitoringDestinations -from meraki_v0.api.content_filtering_categories import AsyncContentFilteringCategories -from meraki_v0.api.content_filtering_rules import AsyncContentFilteringRules -from meraki_v0.api.dashboard_branding_policies import AsyncDashboardBrandingPolicies -from meraki_v0.api.devices import AsyncDevices -from meraki_v0.api.events import AsyncEvents -from meraki_v0.api.firewalled_services import AsyncFirewalledServices -from meraki_v0.api.floor_plans import AsyncFloorPlans -from meraki_v0.api.group_policies import AsyncGroupPolicies -from meraki_v0.api.http_servers import AsyncHTTPServers -from meraki_v0.api.intrusion_settings import AsyncIntrusionSettings -from meraki_v0.api.licenses import AsyncLicenses -from meraki_v0.api.link_aggregations import AsyncLinkAggregations -from meraki_v0.api.mg_dhcp_settings import AsyncMGDHCPSettings -from meraki_v0.api.mg_lan_settings import AsyncMGLANSettings -from meraki_v0.api.mg_connectivity_monitoring_destinations import AsyncMGConnectivityMonitoringDestinations -from meraki_v0.api.mg_port_forwarding_rules import AsyncMGPortForwardingRules -from meraki_v0.api.mg_subnet_pool_settings import AsyncMGSubnetPoolSettings -from meraki_v0.api.mg_uplink_settings import AsyncMGUplinkSettings -from meraki_v0.api.mr_l3_firewall import AsyncMRL3Firewall -from meraki_v0.api.mv_sense import AsyncMVSense -from meraki_v0.api.mx_1_1_nat_rules import AsyncMX11NATRules -from meraki_v0.api.mx_1_many_nat_rules import AsyncMX1ManyNATRules -from meraki_v0.api.mx_l3_firewall import AsyncMXL3Firewall -from meraki_v0.api.mx_l7_application_categories import AsyncMXL7ApplicationCategories -from meraki_v0.api.mx_l7_firewall import AsyncMXL7Firewall -from meraki_v0.api.mx_vlan_ports import AsyncMXVLANPorts -from meraki_v0.api.mx_vpn_firewall import AsyncMXVPNFirewall -from meraki_v0.api.mx_cellular_firewall import AsyncMXCellularFirewall -from meraki_v0.api.mx_inbound_firewall import AsyncMXInboundFirewall -from meraki_v0.api.mx_port_forwarding_rules import AsyncMXPortForwardingRules -from meraki_v0.api.mx_static_routes import AsyncMXStaticRoutes -from meraki_v0.api.mx_warm_spare_settings import AsyncMXWarmSpareSettings -from meraki_v0.api.malware_settings import AsyncMalwareSettings -from meraki_v0.api.management_interface_settings import AsyncManagementInterfaceSettings -from meraki_v0.api.meraki_auth_users import AsyncMerakiAuthUsers -from meraki_v0.api.monitored_media_servers import AsyncMonitoredMediaServers -from meraki_v0.api.named_tag_scope import AsyncNamedTagScope -from meraki_v0.api.netflow_settings import AsyncNetFlowSettings -from meraki_v0.api.networks import AsyncNetworks -from meraki_v0.api.openapi_spec import AsyncOpenAPISpec -from meraki_v0.api.organizations import AsyncOrganizations -from meraki_v0.api.pii import AsyncPII -from meraki_v0.api.radio_settings import AsyncRadioSettings -from meraki_v0.api.saml_roles import AsyncSAMLRoles -from meraki_v0.api.sm import AsyncSM -from meraki_v0.api.snmp_settings import AsyncSNMPSettings -from meraki_v0.api.ssids import AsyncSSIDs -from meraki_v0.api.security_events import AsyncSecurityEvents -from meraki_v0.api.splash_login_attempts import AsyncSplashLoginAttempts -from meraki_v0.api.splash_settings import AsyncSplashSettings -from meraki_v0.api.switch_acls import AsyncSwitchACLs -from meraki_v0.api.switch_port_schedules import AsyncSwitchPortSchedules -from meraki_v0.api.switch_ports import AsyncSwitchPorts -from meraki_v0.api.switch_profiles import AsyncSwitchProfiles -from meraki_v0.api.switch_settings import AsyncSwitchSettings -from meraki_v0.api.switch_stacks import AsyncSwitchStacks -from meraki_v0.api.syslog_servers import AsyncSyslogServers -from meraki_v0.api.traffic_analysis_settings import AsyncTrafficAnalysisSettings -from meraki_v0.api.traffic_shaping import AsyncTrafficShaping -from meraki_v0.api.uplink_settings import AsyncUplinkSettings -from meraki_v0.api.vlans import AsyncVLANs -from meraki_v0.api.webhook_logs import AsyncWebhookLogs -from meraki_v0.api.wireless_health import AsyncWirelessHealth -from meraki_v0.api.wireless_settings import AsyncWirelessSettings +from meraki_v0.aio.api.api_usage import AsyncAPIUsage +from meraki_v0.aio.api.action_batches import AsyncActionBatches +from meraki_v0.aio.api.admins import AsyncAdmins +from meraki_v0.aio.api.alert_settings import AsyncAlertSettings +from meraki_v0.aio.api.bluetooth_clients import AsyncBluetoothClients +from meraki_v0.aio.api.bluetooth_settings import AsyncBluetoothSettings +from meraki_v0.aio.api.camera_quality_retention_profiles import AsyncCameraQualityRetentionProfiles +from meraki_v0.aio.api.cameras import AsyncCameras +from meraki_v0.aio.api.change_log import AsyncChangeLog +from meraki_v0.aio.api.clients import AsyncClients +from meraki_v0.aio.api.config_templates import AsyncConfigTemplates +from meraki_v0.aio.api.connectivity_monitoring_destinations import AsyncConnectivityMonitoringDestinations +from meraki_v0.aio.api.content_filtering_categories import AsyncContentFilteringCategories +from meraki_v0.aio.api.content_filtering_rules import AsyncContentFilteringRules +from meraki_v0.aio.api.dashboard_branding_policies import AsyncDashboardBrandingPolicies +from meraki_v0.aio.api.devices import AsyncDevices +from meraki_v0.aio.api.events import AsyncEvents +from meraki_v0.aio.api.firewalled_services import AsyncFirewalledServices +from meraki_v0.aio.api.floor_plans import AsyncFloorPlans +from meraki_v0.aio.api.group_policies import AsyncGroupPolicies +from meraki_v0.aio.api.http_servers import AsyncHTTPServers +from meraki_v0.aio.api.intrusion_settings import AsyncIntrusionSettings +from meraki_v0.aio.api.licenses import AsyncLicenses +from meraki_v0.aio.api.link_aggregations import AsyncLinkAggregations +from meraki_v0.aio.api.mg_dhcp_settings import AsyncMGDHCPSettings +from meraki_v0.aio.api.mg_lan_settings import AsyncMGLANSettings +from meraki_v0.aio.api.mg_connectivity_monitoring_destinations import AsyncMGConnectivityMonitoringDestinations +from meraki_v0.aio.api.mg_port_forwarding_rules import AsyncMGPortForwardingRules +from meraki_v0.aio.api.mg_subnet_pool_settings import AsyncMGSubnetPoolSettings +from meraki_v0.aio.api.mg_uplink_settings import AsyncMGUplinkSettings +from meraki_v0.aio.api.mr_l3_firewall import AsyncMRL3Firewall +from meraki_v0.aio.api.mv_sense import AsyncMVSense +from meraki_v0.aio.api.mx_1_1_nat_rules import AsyncMX11NATRules +from meraki_v0.aio.api.mx_1_many_nat_rules import AsyncMX1ManyNATRules +from meraki_v0.aio.api.mx_l3_firewall import AsyncMXL3Firewall +from meraki_v0.aio.api.mx_l7_application_categories import AsyncMXL7ApplicationCategories +from meraki_v0.aio.api.mx_l7_firewall import AsyncMXL7Firewall +from meraki_v0.aio.api.mx_vlan_ports import AsyncMXVLANPorts +from meraki_v0.aio.api.mx_vpn_firewall import AsyncMXVPNFirewall +from meraki_v0.aio.api.mx_cellular_firewall import AsyncMXCellularFirewall +from meraki_v0.aio.api.mx_inbound_firewall import AsyncMXInboundFirewall +from meraki_v0.aio.api.mx_port_forwarding_rules import AsyncMXPortForwardingRules +from meraki_v0.aio.api.mx_static_routes import AsyncMXStaticRoutes +from meraki_v0.aio.api.mx_warm_spare_settings import AsyncMXWarmSpareSettings +from meraki_v0.aio.api.malware_settings import AsyncMalwareSettings +from meraki_v0.aio.api.management_interface_settings import AsyncManagementInterfaceSettings +from meraki_v0.aio.api.meraki_auth_users import AsyncMerakiAuthUsers +from meraki_v0.aio.api.monitored_media_servers import AsyncMonitoredMediaServers +from meraki_v0.aio.api.named_tag_scope import AsyncNamedTagScope +from meraki_v0.aio.api.netflow_settings import AsyncNetFlowSettings +from meraki_v0.aio.api.networks import AsyncNetworks +from meraki_v0.aio.api.openapi_spec import AsyncOpenAPISpec +from meraki_v0.aio.api.organizations import AsyncOrganizations +from meraki_v0.aio.api.pii import AsyncPII +from meraki_v0.aio.api.radio_settings import AsyncRadioSettings +from meraki_v0.aio.api.saml_roles import AsyncSAMLRoles +from meraki_v0.aio.api.sm import AsyncSM +from meraki_v0.aio.api.snmp_settings import AsyncSNMPSettings +from meraki_v0.aio.api.ssids import AsyncSSIDs +from meraki_v0.aio.api.security_events import AsyncSecurityEvents +from meraki_v0.aio.api.splash_login_attempts import AsyncSplashLoginAttempts +from meraki_v0.aio.api.splash_settings import AsyncSplashSettings +from meraki_v0.aio.api.switch_acls import AsyncSwitchACLs +from meraki_v0.aio.api.switch_port_schedules import AsyncSwitchPortSchedules +from meraki_v0.aio.api.switch_ports import AsyncSwitchPorts +from meraki_v0.aio.api.switch_profiles import AsyncSwitchProfiles +from meraki_v0.aio.api.switch_settings import AsyncSwitchSettings +from meraki_v0.aio.api.switch_stacks import AsyncSwitchStacks +from meraki_v0.aio.api.syslog_servers import AsyncSyslogServers +from meraki_v0.aio.api.traffic_analysis_settings import AsyncTrafficAnalysisSettings +from meraki_v0.aio.api.traffic_shaping import AsyncTrafficShaping +from meraki_v0.aio.api.uplink_settings import AsyncUplinkSettings +from meraki_v0.aio.api.vlans import AsyncVLANs +from meraki_v0.aio.api.webhook_logs import AsyncWebhookLogs +from meraki_v0.aio.api.wireless_health import AsyncWirelessHealth +from meraki_v0.aio.api.wireless_settings import AsyncWirelessSettings from meraki_v0.config import ( API_KEY_ENVIRONMENT_VARIABLE, DEFAULT_BASE_URL, SINGLE_REQUEST_TIMEOUT, CERTIFICATE_PATH, REQUESTS_PROXY, WAIT_ON_RATE_LIMIT, NGINX_429_RETRY_WAIT_TIME, ACTION_BATCH_RETRY_WAIT_TIME, RETRY_4XX_ERROR,