NO-ISSUE: fix static IPs config option and use a new name

Author: osherdp

Makefile

@@ -340,9 +340,6 @@ deploy_nodes_with_install: start_load_balancer
 		$(MAKE) set_dns; \
 	fi
 
-deploy_static_network_config_nodes_with_install:
-	make deploy_nodes_with_install IS_STATIC_IP="true"
-
 deploy_nodes: start_load_balancer
 	TEST_TEARDOWN=no TEST=./discovery-infra/tests/test_targets.py TEST_FUNC=test_target_deploy_nodes $(MAKE) test
 

README.md

@@ -95,6 +95,7 @@ Check the [Install Guide](GUIDE.md) for installation instructions.
 | `AUTH_TYPE`                   | configure the type of authentication assisted-service will use, default: none |
 | `IPv4`                        | Boolean value indicating if IPv4 is enabled. Default is yes |
 | `IPv6`                        | Boolean value indicating if IPv6 is enabled. Default is no |
+| `STATIC_IPS`                  | Boolean value indicating if static networking should be enabled. Default is no |
 | `OCM_BASE_URL`                | OCM API URL used to communicate with OCM and AMS, default: https://api.integration.openshift.com/ |
 | `OCM_CLIENT_ID`               | ID of Service Account used to communicate with OCM and AMS for Agent Auth and Authz |
 | `OCM_CLIENT_SECRET`           | Password of Service Account used to communicate with OCM and AMS for Agent Auth and Authz |

discovery-infra/start_discovery.py

@@ -6,7 +6,6 @@
 import ipaddress
 import json
 import os
-from assisted_service_client.models import inventory
 
 import yaml
 import dns.resolver
@@ -15,7 +14,7 @@
 from netaddr import IPNetwork
 
 import test_infra.utils.waiting
-from deprecated_utils import get_network_leases, wait_till_nodes_are_ready, get_libvirt_nodes_mac_role_ip_and_name, \
+from deprecated_utils import wait_till_nodes_are_ready, get_libvirt_nodes_mac_role_ip_and_name, \
     get_libvirt_nodes_macs
 from test_infra import assisted_service_api, consts, utils, warn_deprecate
 from test_infra.consts import resources

discovery-infra/test_infra/consts/env_defaults.py

@@ -21,7 +21,7 @@
 DEFAULT_DOWNLOAD_IMAGE: bool = True
 DEFAULT_IS_IPV6: bool = False
 DEFAULT_ADDITIONAL_NTP_SOURCE: str = consts.DEFAULT_ADDITIONAL_NTP_SOURCE
-DEFAULT_IS_STATIC_IP: bool = False
+DEFAULT_STATIC_IPS: bool = False
 DEFAULT_BOOTSTRAP_IN_PLACE: bool = False
 DEFAULT_NETWORK_NAME: str = consts.TEST_NETWORK
 DEFAULT_SINGLE_NODE_IP: str = ""

discovery-infra/test_infra/helper_classes/cluster.py

@@ -720,15 +720,15 @@ def _ha_not_none(self):
                consts.Platforms.NONE
 
     @JunitTestCase()
-    def prepare_for_installation(self, static_network_config=None, **kwargs):
+    def prepare_for_installation(self, **kwargs):
         self.update_config(**kwargs)
         log.info(f"Preparing for installation with cluster configurations: cluster_config={self._config}")
         self.nodes.controller.log_configuration()
 
         if self._config.download_image:
-            if static_network_config:
-                static_network_config = static_network. \
-                    generate_static_network_data_from_tf(self.nodes.controller.tf_folder)
+            if self._config.is_static_ip:
+                static_network_config = \
+                    static_network.generate_static_network_data_from_tf(self.nodes.controller.tf_folder)
             else:
                 static_network_config = None
 

discovery-infra/test_infra/helper_classes/nodes.py

@@ -18,7 +18,7 @@ def __init__(self, node, cluster_host):
 
 
 class Nodes:
-    DEFAULT_STATIC_IP_CONFIG = False
+    DEFAULT_STATIC_IPS_CONFIG = False
 
     def __init__(self, node_controller: NodeController):
         self.controller = node_controller
@@ -88,7 +88,7 @@ def shutdown_all(self):
     def notify_iso_ready(self):
         self.controller.notify_iso_ready()
 
-    def start_all(self, is_static_ip: bool = DEFAULT_STATIC_IP_CONFIG):
+    def start_all(self, is_static_ip: bool = DEFAULT_STATIC_IPS_CONFIG):
         if is_static_ip:
             skip_ips = False
         else:

discovery-infra/test_infra/utils/global_variables/env_variables_defaults.py

@@ -36,7 +36,7 @@ class _EnvVariablesDefaults(ABC):
     service_network_cidr: str = get_env("SERVICE_CIDR", env_defaults.DEFAULT_SERVICE_CIDR)
     cluster_network_cidr: str = get_env("CLUSTER_CIDR", env_defaults.DEFAULT_CLUSTER_CIDR)
     cluster_network_host_prefix: int = int(get_env("HOST_PREFIX", env_defaults.DEFAULT_HOST_PREFIX))
-    is_static_ip: bool = bool(strtobool(get_env("IS_STATIC_IP", default=str(env_defaults.DEFAULT_IS_STATIC_IP))))
+    is_static_ip: bool = bool(strtobool(get_env("STATIC_IPS", default=str(env_defaults.DEFAULT_STATIC_IPS))))
     iso_image_type: str = get_env("ISO_IMAGE_TYPE", env_defaults.DEFAULT_IMAGE_TYPE)
     worker_vcpu: str = get_env("WORKER_CPU", resources.DEFAULT_WORKER_CPU)
     master_vcpu: str = get_env("MASTER_CPU", resources.DEFAULT_MASTER_CPU)

skipper.env

@@ -62,7 +62,7 @@ IPv4
 IPv6
 PYTHONPATH
 PLATFORM
-IS_STATIC_IP
+STATIC_IPS
 PROXY
 CHECK_CLUSTER_VERSION
 ISO_IMAGE_TYPE