adding disgusting function to parse ip address

Signed-off-by: Vanessa Sochat <vsochat@stanford.edu>

Author: vsoch

scompose/client/ps.py

@@ -0,0 +1,38 @@
+'''
+
+Copyright (C) 2019 Vanessa Sochat.
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public
+License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+'''
+
+from scompose.project import Project
+import logging
+import json
+import sys
+import os
+
+
+log = logging.getLogger(__name__)
+
+def main(args, parser, extra):
+    '''bring one or more instances down
+    '''
+    # Initialize the project
+    project = Project(filename=args.file,
+                      name=args.project_name,
+                      env_file=args.env_file)
+
+    # Create instances, and if none specified, create all
+    project.ps()

scompose/client/up.py

@@ -38,4 +38,4 @@ def main(args, parser, extra):
                       env_file=args.env_file)
 
     # Create instances, and if none specified, create all
-    project.up(args.names, writable_tmpfs=writable_tmpfs)
+    project.up(args.names, writable_tmpfs=args.writable_tmpfs)

scompose/project/instance.py

@@ -258,13 +258,13 @@ def exists(self):
         '''return boolean if an instance exists. We do this by way of listing
            instances, and so the calling user is important.
         '''
-        instances = [x.name for x in self.client.instances(quiet=True)]
+        instances = [x.name for x in self.client.instances(quiet=True, sudo=self.sudo)]
         return self.name in instances
 
     def get(self):
         '''If an instance exists, add to self.instance
         '''
-        for instance in self.client.instances(quiet=True):
+        for instance in self.client.instances(quiet=True, sudo=self.sudo):
             if instance.name == self.name:
                 self.instance = instance
                 break
@@ -275,7 +275,7 @@ def stop(self):
         '''
         if self.instance:
             bot.info("Stopping %s" % self)
-            self.instance.stop()
+            self.instance.stop(sudo=self.sudo)
             self.instance = None
 
 # Create and Delete

scompose/project/project.py

@@ -17,8 +17,13 @@
 
 '''
 
+from scompose.templates import get_template
 from scompose.logger import bot
-from scompose.utils import read_yaml
+from scompose.utils import (
+    read_yaml,
+    read_file,
+    write_file
+)
 from spython.main import get_client
 from .instance import Instance
 import json
@@ -158,6 +163,50 @@ def parse(self):
             for _, instance in self.instances.items():
                 instance.set_volumes_from(self.instances)
 
+# Networking
+
+
+    def create_hosts(self, name, depends_on):
+        '''create a hosts file to bind to all containers, where we define the
+           correct hostnames to correspond with the ip addresses created.
+
+           Note: This function is terrible. Singularity should easily expose 
+                 these addresses.
+        '''
+        template = read_file(get_template('hosts'))
+        hosts_file = os.path.join(self.working_dir, 'etc.hosts.%s' % name)
+        hosts_basename = os.path.basename(hosts_file)        
+
+        for _, instance in self.instances.items():
+           if instance.name in depends_on:   
+               if self.sudo:
+                   if instance.exists():
+                       result = self.client.execute(image=instance.instance.get_uri(), 
+                                                    command=['hostname', '-I'],
+                                                    return_result=True,
+                                                    sudo=self.sudo)
+
+                       # Busybox won't have hostname -I
+                       if result['return_code'] != 0:
+                           cmd = "ip -4 --oneline address show up eth0"
+                           result = self.client.execute(image=instance.instance.get_uri(), 
+                                                        command=cmd,
+                                                        return_result=True,
+                                                        sudo=self.sudo)
+
+                       ip_address = result['message'].strip('\n').strip()
+
+                       # Clean up busybox output
+                       if "inet" in ip_address:
+                           ip_address = re.match('.+ inet (?P<address>.+)/', ip_address).groups()[0]
+               else:
+                   ip_address = '127.0.1.1'
+
+               template = ['%s\t%s\n' % (ip_address, instance.name)] + template 
+               instance.volumes.append('%s:/etc/hosts' % hosts_basename)
+        write_file(hosts_file, template)
+
+
 # Commands
 
     def shell(self, name):
@@ -235,6 +284,9 @@ def _create(self, names, command="create", writable_tmpfs=False):
                         count += 1
                         continue
 
+                # Create a hosts file for the instance based on depends
+                self.create_hosts(instance.name, created)
+
                 # If we get here, execute command and add to list
                 getattr(instance, command)(self.working_dir, writable_tmpfs)
                 created.append(instance.name)

scompose/version.py

@@ -31,7 +31,7 @@
 
 
 INSTALL_REQUIRES = (
-    ('spython', {'min_version': '0.0.34'}),
+    ('spython', {'min_version': '0.0.67'}),
 )
 
 INSTALL_REQUIRES_ALL = INSTALL_REQUIRES