hooked up network start to helm

Author: m3dwards

networks/6_node_bitcoin/defaults.yaml

@@ -0,0 +1,41 @@
+collectLogs: true
+metricsExport: true
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+image:
+  repository: bitcoindevproject/bitcoin
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: "27.0"
+
+config: |2+
+    regtest=1
+    checkmempool=0
+    acceptnonstdtxn=1
+    debuglogfile=0
+    logips=1
+    logtimemicros=1
+    capturemessages=1
+    fallbackfee=0.00001000
+    listen=1
+
+    [regtest]
+    rpcuser=user
+    rpcpassword=password
+    rpcport=18443
+    rpcallowip=0.0.0.0/0
+    rpcbind=0.0.0.0
+
+    zmqpubrawblock=tcp://0.0.0.0:28332
+    zmqpubrawtx=tcp://0.0.0.0:28333

networks/6_node_bitcoin/network.yaml

@@ -0,0 +1,10 @@
+nodes:
+  - name: tank-0001
+    config:
+      image:
+        tag: "26.0"
+  - name: tank-0002
+  - name: tank-0003
+  - name: tank-0004
+  - name: tank-0005
+  - name: tank-0006

src/warnet/cli/k8s.py

@@ -1,12 +1,12 @@
-import os
-import subprocess
-from importlib.resources import files
 import json
+from importlib.resources import files
 from typing import Any, Dict
 
 from kubernetes import client, config
 from kubernetes.dynamic import DynamicClient
 
+from .process import stream_command
+
 WAR_MANIFESTS = files("manifests")
 
 
@@ -40,37 +40,6 @@ def get_edges():
     return json.loads(configmap.data["data"])
 
 
-def run_command(command) -> str:
-    result = subprocess.run(
-        command, shell=True, capture_output=True, text=True, executable="/bin/bash"
-    )
-    if result.returncode != 0:
-        raise Exception(result.stderr)
-    return result.stdout
-
-
-def stream_command(command, env=None) -> bool:
-    process = subprocess.Popen(
-        ["/bin/bash", "-c", command],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
-        text=True,
-        bufsize=1,
-        universal_newlines=True,
-    )
-
-    for line in iter(process.stdout.readline, ""):
-        print(line, end="")
-
-    process.stdout.close()
-    return_code = process.wait()
-
-    if return_code != 0:
-        print(f"Command failed with return code {return_code}")
-        return False
-    return True
-
-
 def create_kubernetes_object(
     kind: str, metadata: Dict[str, Any], spec: Dict[str, Any] = None
 ) -> Dict[str, Any]:

src/warnet/cli/main.py

@@ -11,6 +11,7 @@
 
 # from .ln import ln
 from .network import network
+from .network2 import network2
 from .scenarios import scenarios
 
 QUICK_START_PATH = files("scripts").joinpath("quick_start.sh")
@@ -26,6 +27,7 @@ def cli():
 cli.add_command(image)
 # cli.add_command(ln)
 cli.add_command(network)
+cli.add_command(network2)
 cli.add_command(scenarios)
 
 

src/warnet/cli/network.py

@@ -8,20 +8,21 @@
 import networkx as nx
 import yaml
 from rich import print
+
 from .bitcoin import _rpc
 from .k8s import (
     apply_kubernetes_yaml,
+    create_kubernetes_object,
     create_namespace,
     delete_namespace,
     deploy_base_configurations,
-    run_command,
-    stream_command,
-    set_kubectl_context,
-    create_kubernetes_object,
     get_edges,
-    get_mission
+    get_mission,
+    set_kubectl_context,
 )
 
+from .process import stream_command
+
 DEFAULT_GRAPH_FILE = files("graphs").joinpath("default.graphml")
 WAR_MANIFESTS = files("manifests")
 
@@ -77,9 +78,7 @@ def create_node_deployment(node: int, data: dict) -> Dict[str, Any]:
             "name": f"warnet-tank-{node}",
             "namespace": "warnet",
             "labels": {"app": "warnet", "mission": "tank", "index": str(node)},
-            "annotations": {
-                "data": json.dumps(data)
-            }
+            "annotations": {"data": json.dumps(data)},
         },
         spec={
             "containers": [
@@ -134,11 +133,7 @@ def create_config_map(node: int, config: str) -> Dict[str, Any]:
 def create_edges_map(graph):
     edges = []
     for src, dst, data in graph.edges(data=True):
-        edges.append({
-            "src": src,
-            "dst": dst,
-            "data": data
-        })
+        edges.append({"src": src, "dst": dst, "data": data})
     config_map = create_kubernetes_object(
         kind="ConfigMap",
         metadata={
@@ -234,6 +229,7 @@ def connected():
     """Determine if all p2p conenctions defined in graph are established"""
     print(_connected())
 
+
 def _connected():
     tanks = get_mission("tank")
     edges = get_edges()
@@ -263,11 +259,15 @@ def status():
     # TODO: make it a pretty table
     print(_status())
 
+
 def _status():
     tanks = get_mission("tank")
     stats = []
     for tank in tanks:
-        status = {"tank_index": tank.metadata.labels["index"], "bitcoin_status": tank.status.phase.lower()}
+        status = {
+            "tank_index": tank.metadata.labels["index"],
+            "bitcoin_status": tank.status.phase.lower(),
+        }
         stats.append(status)
     return stats
 

src/warnet/cli/network2.py

@@ -0,0 +1,63 @@
+import os
+import tempfile
+from pathlib import Path
+
+import click
+import yaml
+
+from .process import run_command
+
+NETWORK_DIR = Path("networks")
+DEFAULT_NETWORK = "6_node_bitcoin"
+NETWORK_FILE = "network.yaml"
+DEFAULTS_FILE = "defaults.yaml"
+HELM_COMMAND = "helm upgrade --install --create-namespace"
+BITCOIN_CHART_LOCATION = "./resources/charts/bitcoincore"
+NAMESPACE = "warnet"
+
+
+@click.group(name="network2")
+def network2():
+    """Network commands"""
+
+
+@network2.command()
+@click.argument("network_name", default=DEFAULT_NETWORK)
+@click.option("--network", default="warnet", show_default=True)
+@click.option("--logging/--no-logging", default=False)
+def start2(network_name: str, logging: bool, network: str):
+    """Start a warnet with topology loaded from <network_name> into [network]"""
+    full_path = os.path.join(NETWORK_DIR, network_name)
+    network_file_path = os.path.join(full_path, NETWORK_FILE)
+    defaults_file_path = os.path.join(full_path, DEFAULTS_FILE)
+
+    network_file = {}
+    with open(network_file_path) as f:
+        network_file = yaml.safe_load(f)
+
+    for node in network_file["nodes"]:
+        print(f"Starting node: {node.get('name')}")
+        try:
+            temp_override_file_path = ""
+            node_name = node.get("name")
+            node_config_override = node.get("config")
+
+            cmd = f"{HELM_COMMAND} {node_name} {BITCOIN_CHART_LOCATION} --namespace {NAMESPACE} -f {defaults_file_path}"
+
+            if node_config_override:
+                with tempfile.NamedTemporaryFile(
+                    mode="w", suffix=".yaml", delete=False
+                ) as temp_file:
+                    yaml.dump(node_config_override, temp_file)
+                    temp_override_file_path = temp_file.name
+                cmd = f"{cmd} -f {temp_override_file_path}"
+
+            if not run_command(cmd, stream_output=True):
+                print(f"Failed to run Helm command: {cmd}")
+                return
+        except Exception as e:
+            print(f"Error: {e}")
+            return
+        finally:
+            if temp_override_file_path:
+                Path(temp_override_file_path).unlink()

src/warnet/cli/process.py

@@ -0,0 +1,33 @@
+import os
+import subprocess
+
+
+def run_command(command) -> str:
+    result = subprocess.run(
+        command, shell=True, capture_output=True, text=True, executable="/bin/bash"
+    )
+    if result.returncode != 0:
+        raise Exception(result.stderr)
+    return result.stdout
+
+
+def stream_command(command, env=None) -> bool:
+    process = subprocess.Popen(
+        ["/bin/bash", "-c", command],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        text=True,
+        bufsize=1,
+        universal_newlines=True,
+    )
+
+    for line in iter(process.stdout.readline, ""):
+        print(line, end="")
+
+    process.stdout.close()
+    return_code = process.wait()
+
+    if return_code != 0:
+        print(f"Command failed with return code {return_code}")
+        return False
+    return True