Changeset 10469

Timestamp:

10/25/10 14:52:15 (3 years ago)

Author:

Snyder.Jason

Message:

alf now checks to see if the naming service is running and starts it if necessary, using the naming.service.start.command found in ~/.ossie.cfg

Location:

ossiedev/trunk/tools/alf

Files:

• ALF.py (modified) (1 diff)
• ALFNodeBooterUtils.py (modified) (2 diffs)

ossiedev/trunk/tools/alf/ALF.py

@@ -141 +141 @@
         
         self.Bind(wx.EVT_CLOSE, self.OnClose)
+
         self.nodeBooterProcess = None
         nbUtils = ALFNodeBooterUtils()
+        if not nbUtils.namingServiceIsRunning():
+            nbUtils.startNamingService()
         if not nbUtils.nodeBooterIsRunning():
             self.nodeBooterProcess = nbUtils.startNodeBooter()

ossiedev/trunk/tools/alf/ALFNodeBooterUtils.py

@@ -22 +22 @@
 import time
 import ConfigParser
+import wx
 
 
@@ -52 +53 @@
         return nodeBooterProcess
             
+            
+    def namingServiceIsRunning(self):
+        namecltResult = os.popen('nameclt list').read()
+        if namecltResult.startswith('DomainName'):
+            return True
+        return False;
+    
+    def startNamingService(self):
+        configFile = os.getenv('HOME') + '/.ossie.cfg'
+        if os.path.exists(configFile):
+            configParser = ConfigParser.SafeConfigParser()
+            configParser.read(configFile)
+            nsCommand = configParser.get('ossie', 'naming.service.start.command')
+            if not nsCommand == None:
+                if nsCommand.startswith('sudo'):
+                    dialog = wx.TextEntryDialog(None, 'Please enter your root password to restart the naming service:', 'Restart Naming Service', '', style = wx.TE_PASSWORD | wx.OK | wx.CANCEL)
+                    if dialog.ShowModal() == wx.ID_OK:
+                        password = dialog.GetValue()
+                        command = 'echo ' + '\"' + password + '\"' + ' | sudo -kS ' + nsCommand[5:]
+                        subprocess.Popen(command, shell=True)
+                        time.sleep(2)
+                else:
+                        subprocess.Popen(nsCommand, shell=True)
+        else:
+            #default case
+            nsCommand = 'sudo service omniorb4-nameserver restart'
+            dialog = wx.TextEntryDialog(None, 'Please enter your root password to restart the naming service:', 'Restart Naming Service', '', style = wx.TE_PASSWORD | wx.OK | wx.CANCEL)
+            if dialog.ShowModal() == wx.ID_OK:
+                password = dialog.GetValue()
+                command = 'echo ' + '\"' + password + '\"' + ' | sudo -kS ' + nsCommand[5:]
+                subprocess.Popen(command, shell=True)
+                time.sleep(2)
+