Main nonwindows

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.3.19
+current_version = 4.3.29
 commit = True
 tag = False
 

LICENSE

@@ -2,7 +2,8 @@
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
-   Copyright 2017 Gregor von Laszewski, Indiana University
+   Copyright 2017-2021 Gregor von Laszewski, Indiana University
+   Copyright 2021,2022 Gregor von Laszewski, University of Virginia
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

VERSION

@@ -1 +1 @@
-4.3.19
+4.3.29

cloudmesh/burn/Iso.py

@@ -1,6 +1,8 @@
 import os
+# import wget
 
 from cloudmesh.burn.image import Image
+from cloudmesh.common.Shell import Shell
 
 
 class Iso:
@@ -13,4 +15,6 @@ def get(tag="latest"):
         url = Iso.distribution[tag]
         destination = Image().directory + os.path.basename(url)
 
-        os.system(f'wget -O {destination} {url}')
+        Shell.download(url, destination, provider='system')
+        # wget.download(url, out=destination)
+        # os.system(f'wget -O {destination} {url}')

cloudmesh/burn/__init__.py

@@ -1 +1 @@
-__version__ = "4.3.19"
+__version__ = "4.3.29"

cloudmesh/burn/__version__.py

@@ -1 +1 @@
-version = "4.3.19"
+version = "4.3.29"

cloudmesh/burn/burner/Burner.py

@@ -1,4 +1,5 @@
 import os
+# import wget
 
 from cloudmesh.burn.burner.raspberryos import Burner as RaspberryOsBurner
 from cloudmesh.burn.usb import USB
@@ -53,11 +54,12 @@ def install(self):
             return ""
         else:
             banner("Installing pishrink.sh into /usr/local/bin")
+            script_name = Shell.download(
+                'https://raw.githubusercontent.com/Drewsif/PiShrink/master/pishrink.sh', 'pishrink.sh', provider='system')
             script = \
-                """
-                wget https://raw.githubusercontent.com/Drewsif/PiShrink/master/pishrink.sh
-                chmod +x pishrink.sh
-                sudo mv pishrink.sh /usr/local/bin
+                f"""
+                chmod +x {script_name}
+                sudo mv {script_name} /usr/local/bin
                 """
 
             result = JobScript.execute(script)

cloudmesh/burn/burner/RaspberryBurner.py

@@ -1,13 +1,22 @@
+import os
 import time
+from getpass import getpass
 
 from cloudmesh.burn.burner.BurnerABC import AbstractBurner
+from cloudmesh.burn.image import Image
 from cloudmesh.burn.raspberryos.cmdline import Cmdline
 from cloudmesh.burn.raspberryos.runfirst import Runfirst
 from cloudmesh.burn.sdcard import SDCard
 from cloudmesh.burn.usb import USB
+from cloudmesh.burn.wifi.ssid import get_ssid
+from cloudmesh.common.Host import Host
+from cloudmesh.common.Shell import Shell
 from cloudmesh.common.console import Console
 from cloudmesh.common.parameter import Parameter
-from cloudmesh.common.util import yn_choice, readfile
+from cloudmesh.common.util import banner
+from cloudmesh.common.util import path_expand
+from cloudmesh.common.util import readfile
+from cloudmesh.common.util import yn_choice
 from cloudmesh.inventory.inventory import Inventory
 
 
@@ -17,21 +26,78 @@ class Burner(AbstractBurner):
 
     Inventory should contain information on manager and workers
     """
-    def __init__(self, inventory=None):
+    def __init__(self, inventory=None, names=None, ssid=None,
+                 wifipassword=None, force_inv=False, country=None):
         # Get inventory
+        self.ssid = ssid
+        self.wifipasswd = wifipassword
         if inventory is None:
-            inv = Inventory()
+            names = Parameter.expand(names)
+            manager, workers = Host.get_hostnames(names)
+            if workers:
+                worker_base_name = ''.join(
+                    [i for i in workers[0] if not i.isdigit()])
+
+            cluster_name = manager or worker_base_name
+            inventory = path_expand(f'~/.cloudmesh/inventory-{cluster_name}.yaml')
+
+            if not os.path.exists(inventory) or force_inv:
+                if not manager:
+                    Console.error("No inventory found. Can not create an "
+                                  "inventory without a "
+                                  "manager.")
+                    return ""
+
+                Inventory.build_default_inventory(filename=inventory,
+                                                  manager=manager,
+                                                  workers=workers)
+            inv = Inventory(filename=inventory)
+
         else:
             inv = Inventory(filename=inventory)
+        self.inventory = inv
 
         # Find managers and workers
         managers = inv.find(service='manager')
+        if len(managers) > 0:
+            if not self.ssid:
+                self.ssid = get_ssid()
+                if self.ssid == "":
+                    Console.info('Could not determine SSID, skipping wifi '
+                                 'config')
+                    self.ssid = None
+            if not self.wifipasswd and self.ssid:
+                self.wifipasswd = getpass(f"Using --SSID={self.ssid}, please "
+                                          f"enter wifi password:")
         workers = inv.find(service='worker')
-
         # No inherenet need to distinguish the configs by service
         configs = managers + workers
         # Create dict for them for easy lookup
         self.configs = dict((config['host'], config) for config in configs)
+        self.get_images()
+        self.country = country if country else Shell.locale().upper()
+
+    def get_images(self):
+        """
+        Downloads all tags found in self.configs
+        """
+        tags = set()
+        for config in self.configs.values():
+            try:
+                tags.add(config['tag'])
+            except KeyError as e:
+                Console.warning(f'Could not find tag for {config["host"]}. Skipping')
+
+        banner("Downloading Images", figlet=True)
+
+        image = Image()
+
+        for tag in tags:
+            Console.info(f'Attempting to download {tag}')
+            res = image.fetch(tag=[tag])
+            if not res:
+                Console.error('Failed Image Fetch.')
+                raise Exception('Failed Image Fetch')
 
     def cluster(self, arguments=None):
         raise NotImplementedError
@@ -41,9 +107,7 @@ def burn(self,
              device=None,
              verbose=False,
              password=None,
-             ssid=None,
-             wifipasswd=None,
-             country=None):
+             ):
         """
         Given the name of a config, burn device with RaspberryOS and configure properly
         """
@@ -68,6 +132,8 @@ def burn(self,
             print()
             return ""
 
+        banner(f"Burn {name}", figlet=True)
+
         # Confirm card is inserted into device path
         if not yn_choice(f'Is the card to be burned for {name} inserted?'):
             if not yn_choice(f"Please insert the card to be burned for {name}. "
@@ -103,8 +169,8 @@ def burn(self,
             runfirst.set_password(password=password)
 
         runfirst.set_locale(timezone=config['timezone'], locale=config['locale'])
-        if ssid:
-            runfirst.set_wifi(ssid, wifipasswd, country=country)
+        if self.ssid and 'wifi' in config['services']:
+            runfirst.set_wifi(self.ssid, self.wifipasswd, self.country)
 
         runfirst.set_key(key=readfile(config['keyfile']).strip())
         if 'bridge' in config['services']:
@@ -120,16 +186,14 @@ def burn(self,
         return
 
     def inventory(self, arguments=None):
-        raise NotImplementedError
+        return self.inventory
 
     def multi_burn(self,
                    names=None,
                    devices=None,
                    verbose=False,
                    password=None,
-                   ssid=None,
-                   wifipasswd=None,
-                   country=None):
+                   ):
         """
         Given multiple names, burn them
         """
@@ -152,10 +216,7 @@ def multi_burn(self,
                 name=name,
                 device=devices[0],
                 verbose=verbose,
-                password=password,
-                ssid=ssid,
-                wifipasswd=wifipasswd,
-                country=None
+                password=password
             )
         Console.ok('Finished burning all cards')