aboutsummaryrefslogtreecommitdiffstats
path: root/test/mocks
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-03-05 10:28:03 +0100
committerMarco Platania <platania@research.att.com>2020-03-05 15:26:40 +0000
commit3d3d3c28d88d1f7bad2b9a274fe9ad4cfaf01554 (patch)
tree2f33b3f16289d8555173f011737d611515e7541b /test/mocks
parent5d8a1df2dbfd99fa87e792c584ac220187c9928e (diff)
Fix indentation and whitespace issues in Python scripts
Reported by pylint. Change-Id: I9d5ee152f3587bb2d7e8abee919e4ffe47d8ae85 Issue-ID: INT-1427 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'test/mocks')
-rwxr-xr-xtest/mocks/mass-pnf-sim/mass-pnf-sim.py21
-rw-r--r--test/mocks/pnfsimulator/netconfsimulator/netconf/__init__.py4
-rwxr-xr-xtest/mocks/pnfsimulator/netconfsimulator/netconf/set-up-xmls.py8
-rw-r--r--test/mocks/pnfsimulator/netconfsimulator/netconf/test_yang_loader_server.py4
-rw-r--r--test/mocks/pnfsimulator/netconfsimulator/netconf/yang_loader_server.py4
5 files changed, 19 insertions, 22 deletions
diff --git a/test/mocks/mass-pnf-sim/mass-pnf-sim.py b/test/mocks/mass-pnf-sim/mass-pnf-sim.py
index 353631d56..98b66f28d 100755
--- a/test/mocks/mass-pnf-sim/mass-pnf-sim.py
+++ b/test/mocks/mass-pnf-sim/mass-pnf-sim.py
@@ -76,9 +76,9 @@ if args.bootstrap and args.ipstart and args.urlves:
start_port=2000
ftps_pasv_port_start=8000
ftps_pasv_port_num_of_ports=10
-
+
ftps_pasv_port_end=ftps_pasv_port_start + ftps_pasv_port_num_of_ports
-
+
for i in range(int(args.bootstrap)):
print("PNF simulator instance: " + str(i) + ".")
@@ -97,13 +97,13 @@ if args.bootstrap and args.ipstart and args.urlves:
IpFileServer = args.ipfileserver
TypeFileServer = args.typefileserver
-
+
PortSftp=start_port +1
- PortFtps=start_port +2
+ PortFtps=start_port +2
start_port +=2
UrlFtps = str(ipaddress.ip_address(args.ipstart) + int(3 + (i * 16)))
print("\tUrl Ftps: " + str(UrlFtps))
-
+
UrlSftp = str(ipaddress.ip_address(args.ipstart) + int(4 + (i * 16)))
print("\tUrl Sftp: " + str(UrlSftp))
@@ -138,7 +138,7 @@ if args.bootstrap and args.ipstart and args.urlves:
composercmd,
shell=True)
print('Cloning:', completed.stdout)
-
+
ftps_pasv_port_start += ftps_pasv_port_num_of_ports + 1
ftps_pasv_port_end += ftps_pasv_port_num_of_ports +1
@@ -202,23 +202,20 @@ if args.trigger:
"; ./simulator.sh trigger-simulator",
shell=True)
print('Status:', completed.stdout)
-
+
if args.triggerstart and args.triggerend:
print("Triggering VES sending by a range of simulators:")
-
+
for i in range(int(args.triggerstart), int(args.triggerend)+1):
foldername = "pnf-sim-lw-" + str(i)
print("Instance being processed:" + str(i))
-
+
completed = subprocess.run(
'cd ' +
foldername +
"; ./simulator.sh trigger-simulator",
shell=True)
print('Status:', completed.stdout)
-
-
-
else:
print("No instruction was defined")
sys.exit()
diff --git a/test/mocks/pnfsimulator/netconfsimulator/netconf/__init__.py b/test/mocks/pnfsimulator/netconfsimulator/netconf/__init__.py
index 0f144c21e..aa8b4f995 100644
--- a/test/mocks/pnfsimulator/netconfsimulator/netconf/__init__.py
+++ b/test/mocks/pnfsimulator/netconfsimulator/netconf/__init__.py
@@ -7,9 +7,9 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/test/mocks/pnfsimulator/netconfsimulator/netconf/set-up-xmls.py b/test/mocks/pnfsimulator/netconfsimulator/netconf/set-up-xmls.py
index cdc4e4f3d..2ec1cf2b9 100755
--- a/test/mocks/pnfsimulator/netconfsimulator/netconf/set-up-xmls.py
+++ b/test/mocks/pnfsimulator/netconfsimulator/netconf/set-up-xmls.py
@@ -9,9 +9,9 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,8 +29,8 @@ logging.basicConfig()
logger = logging.getLogger()
logger.setLevel(logging.INFO)
-# Placeholders definition - this needs to match placeholders in
-# load_server_certs_xml_file and tls_listen_xml_file
+# Placeholders definition - this needs to match placeholders in
+# load_server_certs_xml_file and tls_listen_xml_file
SERVER_KEY_NAME = "SERVER_KEY_NAME"
SERVER_CERT_NAME = "SERVER_CERT_NAME"
SERVER_CERTIFICATE_HERE = "SERVER_CERTIFICATE_HERE"
diff --git a/test/mocks/pnfsimulator/netconfsimulator/netconf/test_yang_loader_server.py b/test/mocks/pnfsimulator/netconfsimulator/netconf/test_yang_loader_server.py
index c5bd08dd4..a22208711 100644
--- a/test/mocks/pnfsimulator/netconfsimulator/netconf/test_yang_loader_server.py
+++ b/test/mocks/pnfsimulator/netconfsimulator/netconf/test_yang_loader_server.py
@@ -7,9 +7,9 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/test/mocks/pnfsimulator/netconfsimulator/netconf/yang_loader_server.py b/test/mocks/pnfsimulator/netconfsimulator/netconf/yang_loader_server.py
index f414467d0..27d46cea5 100644
--- a/test/mocks/pnfsimulator/netconfsimulator/netconf/yang_loader_server.py
+++ b/test/mocks/pnfsimulator/netconfsimulator/netconf/yang_loader_server.py
@@ -7,9 +7,9 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.