projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating tox.ini
[osm/RO.git]
/
RO-VIM-azure
/
osm_rovim_azure
/
vimconn_azure.py
diff --git
a/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py
b/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py
index
a1d3aa8
..
729db82
100755
(executable)
--- a/
RO-VIM-azure/osm_rovim_azure/vimconn_azure.py
+++ b/
RO-VIM-azure/osm_rovim_azure/vimconn_azure.py
@@
-14,28
+14,27
@@
##
import base64
##
import base64
-from osm_ro_plugin import vimconn
import logging
import logging
-import netaddr
+from os import getenv
import re
import re
-from
os import getenv
+from
azure.core.exceptions import ResourceNotFoundError
from azure.identity import ClientSecretCredential
from azure.identity import ClientSecretCredential
-from azure.mgmt.resource import ResourceManagementClient
-from azure.mgmt.network import NetworkManagementClient
from azure.mgmt.compute import ComputeManagementClient
from azure.mgmt.compute.models import DiskCreateOption
from azure.mgmt.compute import ComputeManagementClient
from azure.mgmt.compute.models import DiskCreateOption
-from azure.core.exceptions import ResourceNotFoundError
+from azure.mgmt.network import NetworkManagementClient
+from azure.mgmt.resource import ResourceManagementClient
from azure.profiles import ProfileDefinition
from azure.profiles import ProfileDefinition
-from msrestazure.azure_exceptions import CloudError
+from cryptography.hazmat.backends import default_backend as crypto_default_backend
+from cryptography.hazmat.primitives import serialization as crypto_serialization
+from cryptography.hazmat.primitives.asymmetric import rsa
from msrest.exceptions import AuthenticationError
from msrest.exceptions import AuthenticationError
+from msrestazure.azure_exceptions import CloudError
import msrestazure.tools as azure_tools
import msrestazure.tools as azure_tools
+import netaddr
+from osm_ro_plugin import vimconn
from requests.exceptions import ConnectionError
from requests.exceptions import ConnectionError
-from cryptography.hazmat.primitives import serialization as crypto_serialization
-from cryptography.hazmat.primitives.asymmetric import rsa
-from cryptography.hazmat.backends import default_backend as crypto_default_backend
-
__author__ = "Isabel Lloret, Sergio Gonzalez, Alfonso Tierno, Gerardo Garcia"
__date__ = "$18-apr-2019 23:59:59$"
__author__ = "Isabel Lloret, Sergio Gonzalez, Alfonso Tierno, Gerardo Garcia"
__date__ = "$18-apr-2019 23:59:59$"
@@
-548,7
+547,9
@@
class vimconnector(vimconn.VimConnector):
self._reload_connection()
subnet_id = net["net_id"]
self._reload_connection()
subnet_id = net["net_id"]
- location = self.region or self._get_location_from_resource_group(self.resource_group)
+ location = self.region or self._get_location_from_resource_group(
+ self.resource_group
+ )
try:
net_ifz = {"location": location}
net_ip_config = {
try:
net_ifz = {"location": location}
net_ip_config = {