From 94a094628f2470dba79c6b5ee74a0cb4a67d0bbe Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 24 Mar 2022 11:09:35 +0100 Subject: [PATCH 1/2] Use PRIVATE_NET_MASKS in Azure conn --- test/unit/connectors/Azure.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/unit/connectors/Azure.py b/test/unit/connectors/Azure.py index f88b27681..9818f2dc2 100755 --- a/test/unit/connectors/Azure.py +++ b/test/unit/connectors/Azure.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from distutils.command.config import config import sys import unittest From b4de46467fd73769fbb154158be423c254742ac7 Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 24 Mar 2022 11:13:52 +0100 Subject: [PATCH 2/2] Enable to use / to split net subnet name --- IM/connectors/Azure.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/IM/connectors/Azure.py b/IM/connectors/Azure.py index 3d4307a9a..19c029949 100644 --- a/IM/connectors/Azure.py +++ b/IM/connectors/Azure.py @@ -685,7 +685,9 @@ def create_nets(self, radl, credentials, subscription_id, group_name, inf): if net.getValue("provider_id"): parts = net.getValue("provider_id").split(".") if len(parts) != 2: - raise Exception("Invalid provider_id format: net_name.subnet_name") + parts = net.getValue("provider_id").split("/") + if len(parts) != 2: + raise Exception("Invalid provider_id format: net_name.subnet_name") vnet_name = parts[0] subnet_name = parts[1]