sbcli-dev 4.0.14__zip → 4.0.15__zip

{sbcli_dev-4.0.14 → sbcli_dev-4.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-dev
-Version: 4.0.14
+Version: 4.0.15
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_dev-4.0.14 → sbcli_dev-4.0.15}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=4.0.14
+SIMPLY_BLOCK_VERSION=4.0.15
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main-dev

{sbcli_dev-4.0.14 → sbcli_dev-4.0.15}/sbcli_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-dev
-Version: 4.0.14
+Version: 4.0.15
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_dev-4.0.14 → sbcli_dev-4.0.15}/simplyblock_core/cluster_ops.py

@@ -135,7 +135,7 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
             c.swarm.leave(force=True)
             time.sleep(3)
 
-        c.swarm.init()
+        c.swarm.init(DEV_IP)
         logger.info("Configuring docker swarm > Done")
     except Exception as e:
         print(e)

{sbcli_dev-4.0.14 → sbcli_dev-4.0.15}/simplyblock_web/blueprints/snode_ops.py

@@ -40,6 +40,29 @@ def get_google_cloud_info():
         pass
 
 
+def get_equinix_cloud_info():
+    try:
+        response = requests.get("https://metadata.platformequinix.com/metadata")
+        data = response.json()
+        public_ip = ""
+        ip = ""
+        for interface in data["network"]["addresses"]:
+            if interface["address_family"] == 4:
+                if interface["enabled"] and interface["public"]:
+                    public_ip = interface["address"]
+                elif interface["enabled"] and not interface["public"]:
+                    public_ip = interface["address"]
+        return {
+            "id": str(data["id"]),
+            "type": data["class"],
+            "cloud": "equinix",
+            "ip": public_ip,
+            "public_ip": ip
+        }
+    except:
+        pass
+
+
 def get_amazon_cloud_info():
     try:
         from ec2_metadata import ec2_metadata
@@ -408,6 +431,9 @@ CLOUD_INFO = get_amazon_cloud_info()
 if not CLOUD_INFO:
     CLOUD_INFO = get_google_cloud_info()
 
+if not CLOUD_INFO:
+    CLOUD_INFO = get_equinix_cloud_info()
+
 if CLOUD_INFO:
     SYSTEM_ID = CLOUD_INFO["id"]
 else:

{sbcli_dev-4.0.14 → sbcli_dev-4.0.15}/simplyblock_web/blueprints/snode_ops_k8s.py

@@ -74,6 +74,29 @@ def get_google_cloud_info():
         pass
 
 
+def get_equinix_cloud_info():
+    try:
+        response = requests.get("https://metadata.platformequinix.com/metadata")
+        data = response.json()
+        public_ip = ""
+        ip = ""
+        for interface in data["network"]["addresses"]:
+            if interface["address_family"] == 4:
+                if interface["enabled"] and interface["public"]:
+                    public_ip = interface["address"]
+                elif interface["enabled"] and not interface["public"]:
+                    public_ip = interface["address"]
+        return {
+            "id": str(data["id"]),
+            "type": data["class"],
+            "cloud": "equinix",
+            "ip": public_ip,
+            "public_ip": ip
+        }
+    except:
+        pass
+
+
 def get_amazon_cloud_info():
     try:
         from ec2_metadata import ec2_metadata
@@ -280,6 +303,9 @@ CLOUD_INFO = get_amazon_cloud_info()
 if not CLOUD_INFO:
     CLOUD_INFO = get_google_cloud_info()
 
+if not CLOUD_INFO:
+    CLOUD_INFO = get_equinix_cloud_info()
+
 if CLOUD_INFO:
     SYSTEM_ID = CLOUD_INFO["id"]
 else: