Merge pull request #93 from 2ndWatch/add-instance-sizing

Update CE to handle instance type updates

Author: twarnock

Makefile

@@ -8,7 +8,7 @@ SHA1 := $$(git log -1 --pretty=%h)
 CURRENT_BRANCH := $$(git symbolic-ref -q --short HEAD)
 LATEST_TAG := ${REPO_NAME}:latest
 GIT_TAG := ${REPO_NAME}:${SHA1}
-VERSION := v0.1.7
+VERSION := v0.1.8
 
 info: ## Show information about the current git state.
 	@echo "Github Project: https://github.com/${REPO_NAME}\nCurrent Branch: ${CURRENT_BRANCH}\nSHA1: ${SHA1}\n"

cloudendure/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.1.8"

cloudendure/api.py

@@ -21,8 +21,9 @@
 from requests.models import Response
 from requests.sessions import Session
 
-from .config import CloudEndureConfig
-from .exceptions import CloudEndureException
+from cloudendure.config import CloudEndureConfig
+from cloudendure.exceptions import CloudEndureException
+from cloudendure.utils import get_user_agent
 
 HOST: str = os.environ.get("CLOUDENDURE_HOST", "https://console.cloudendure.com")
 API_VERSION: str = os.environ.get("CLOUDENDURE_API_VERSION", "latest").lower()
@@ -65,6 +66,7 @@ def __init__(self, config: CloudEndureConfig, *args, **kwargs) -> None:
         self.session.headers: Dict[str, str] = {
             "Content-Type": "application/json",
             "Accept": "text/plain",
+            "User-Agent": get_user_agent(),
         }
         self.timestamps: Dict[str, Any] = {
             "created": time_now,

cloudendure/cloudendure.py

@@ -82,6 +82,23 @@ def __init__(
         self.target_machines: List[str] = self.config.active_config.get(
             "machines", ""
         ).split(",")
+        self.target_instance_types: List[str] = self.config.active_config.get(
+            "instance_types", ""
+        ).split(",")
+        if len(self.target_machines) == len(self.target_instance_types):
+            self.target_instances: Dict[str, str] = dict(
+                zip(self.target_machines, self.target_instance_types)
+            )
+        else:
+            print(
+                "WARNING: Misconfiguration of CLOUDENDURE_INSTANCE_TYPES and CLOUDENDURE_MACHINES.  These should be the same length!"
+            )
+            self.target_instances = {}
+
+        self.lagging_machines: List[str] = []
+        self.ready_machines: List[str] = []
+        self.nonexistent_machines: List[str] = []
+        self.launched_machines: List[str] = []
         self.migration_wave: str = self.config.active_config.get("migration_wave", "0")
         self.max_lag_ttl: int = self.config.active_config.get("max_lag_ttl", 90)
 
@@ -504,6 +521,10 @@ def update_blueprint(self) -> bool:
                 if self.security_group_id:
                     blueprint["securityGroupIDs"] = [self.security_group_id]
 
+                instance_type = self.target_instances.get(machine_name, "")
+                if instance_type:
+                    blueprint["instanceType"] = instance_type
+
                 # Update machine tags
                 blueprint["tags"] = [
                     {
@@ -680,8 +701,8 @@ def status(self) -> bool:
                                     )
                                     return False
             if not machine_exist:
-                print("ERROR: Machine: " + _machine + " does not exist!")
-                return False
+                print(f"ERROR: Machine: {_machine} does not exist!")
+                self.nonexistent_machines.append(_machine)
 
         if machine_status == len(self.target_machines):
             print("All Machines in the targeted pool are ready!")

cloudendure/cloudendure_api/configuration.py

@@ -222,9 +222,7 @@ def get_api_key_with_prefix(self, identifier: str) -> str:
 
         """
         if self.api_key.get(identifier) and self.api_key_prefix.get(identifier):
-            return (
-                f"{self.api_key_prefix[identifier]} {self.api_key[identifier]}"
-            )  # noqa: E501
+            return f"{self.api_key_prefix[identifier]} {self.api_key[identifier]}"  # noqa: E501
         if self.api_key.get(identifier):
             return self.api_key[identifier]
         return ""

cloudendure/cloudendure_api/test/test_replication_api.py

@@ -71,7 +71,7 @@ def test_projects_project_id_replication_configurations_post(self):
         pass
 
     def test_projects_project_id_replication_configurations_replication_configuration_id_patch(
-        self
+        self,
     ):
         """Test case for projects_project_id_replication_configurations_replication_configuration_id_patch
 

cloudendure/config.py

@@ -40,6 +40,7 @@ class CloudEndureConfig:
         "private_ip_action": "",
         "disk_type": "SSD",
         "public_ip": "DONT_ALLOCATE",
+        "instance_types": "",
     }
 
     def __init__(

cloudendure/utils.py

@@ -15,10 +15,27 @@
 from datetime import datetime
 from typing import Any, Dict
 
+from cloudendure.__version__ import __version__ as cloudendure_version
+
 first_cap_re: re.Pattern = re.compile("(.)([A-Z][a-z]+)")
 all_cap_re: re.Pattern = re.compile("([a-z0-9])([A-Z])")
 
 
+def get_user_agent(user_agent: str = "cloudendure-python") -> str:
+    """Get the current module version.
+
+    Args:
+        user_agent (str): The user agent client designation.
+            Defaults to: cloudendure-python
+
+    Returns:
+        str: The user agent string representation for the client.
+
+    """
+    user_agent_str: str = f"{user_agent}/{cloudendure_version}"
+    return user_agent_str
+
+
 def get_time_now() -> Dict[str, Any]:
     """Get the current time in UTC as milliseconds.
 

setup.py

@@ -23,7 +23,7 @@
 EMAIL: str = "[email protected], [email protected]"
 AUTHOR: str = "Mark Beacom, Tom Warnock"
 REQUIRES_PYTHON: str = ">=3.7.0"
-VERSION: str = "0.1.7"
+VERSION: str = os.environ.get("CLOUDENDURE_CLIENT_VERSION", "")
 
 REQUIRED: List[str] = ["requests", "boto3", "fire"]
 EXTRAS: Dict[str, List[str]] = {