You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/09/29 12:08:12 UTC

[incubator-dlab] branch DLAB-1911 updated: [DLAB-1911]: changed arguments when calling create_security_group

This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DLAB-1911
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1911 by this push:
     new 2cb40f5  [DLAB-1911]: changed arguments when calling create_security_group
2cb40f5 is described below

commit 2cb40f5437ff0e6356c040d9fe77023746387adc
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Sep 29 15:07:56 2020 +0300

    [DLAB-1911]: changed arguments when calling create_security_group
---
 .../scripts/azure/common_create_security_group.py  |  2 +-
 .../src/general/scripts/azure/ssn_prepare.py       | 24 +---------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/infrastructure-provisioning/src/general/scripts/azure/common_create_security_group.py b/infrastructure-provisioning/src/general/scripts/azure/common_create_security_group.py
index 62cd0d7..64e5ff1 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/common_create_security_group.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/common_create_security_group.py
@@ -44,7 +44,7 @@ if __name__ == "__main__":
             print("Creating security group {}.".format(args.security_group_name))
             security_group = AzureActions().create_security_group(args.resource_group_name, args.security_group_name,
                                                                   args.region, json.loads(args.tags),
-                                                                  json.loads(args.list_rules))
+                                                                  args.list_rules)
             print("SECURITY GROUP {} has been created".format(args.security_group_name))
     except Exception as err:
         print('Error: {0}'.format(err))
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
index c82cdf7..1c41db5 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
@@ -197,7 +197,7 @@ if __name__ == "__main__":
                     "name": "in-1",
                     "protocol": "Tcp",
                     "source_port_range": "*",
-                    "destination_port_range": "80",
+                    "destination_port_range": ["80", "443", "22"],
                     "source_address_prefix": ssn_conf['allowed_ip_cidr'],
                     "destination_address_prefix": "*",
                     "access": "Allow",
@@ -205,28 +205,6 @@ if __name__ == "__main__":
                     "direction": "Inbound"
                 },
                 {
-                    "name": "in-2",
-                    "protocol": "Tcp",
-                    "source_port_range": "*",
-                    "destination_port_range": "443",
-                   "source_address_prefix": ssn_conf['allowed_ip_cidr'],
-                    "destination_address_prefix": "*",
-                    "access": "Allow",
-                    "priority": 110,
-                    "direction": "Inbound"
-                },
-                {
-                    "name": "in-3",
-                    "protocol": "Tcp",
-                    "source_port_range": "*",
-                    "destination_port_range": "22",
-                    "source_address_prefix": ssn_conf['allowed_ip_cidr'],
-                    "destination_address_prefix": "*",
-                    "access": "Allow",
-                    "priority": 120,
-                    "direction": "Inbound"
-                },
-                {
                     "name": "out-1",
                     "protocol": "*",
                     "source_port_range": "*",


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org