From f40479812061479ebf201e416178355775370423 Mon Sep 17 00:00:00 2001 From: Ricky C Date: Mon, 9 Apr 2018 16:32:46 -0700 Subject: [PATCH] OpenSim -> Halcyon --- src/console.py | 2 +- src/inworldz/maestro/Region.py | 2 +- src/inworldz/maestro/System.py | 2 +- src/inworldz/util/network.py | 4 ++-- src/inworldz/util/provision.py | 2 +- tests/CreateRegion.py | 2 +- tests/UpdateGridServices.py | 2 +- tests/ZooKeeperTestClient.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/console.py b/src/console.py index 817f302..dcdaba9 100644 --- a/src/console.py +++ b/src/console.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 ''' -RestConsole -- Implements a remote console using Rest to the OpenSim Services +RestConsole -- Implements a remote console using Rest to the Halcyon Services @author: Mike Dickson @copyright: 2013 InWorldz, LLC. All rights reserved. diff --git a/src/inworldz/maestro/Region.py b/src/inworldz/maestro/Region.py index ff2a919..16eda17 100644 --- a/src/inworldz/maestro/Region.py +++ b/src/inworldz/maestro/Region.py @@ -36,7 +36,7 @@ def __init__(self, uuid, record={}): ServiceBase.__init__(self, uuid, record) self.props = DefaultProperties.instance() dbconfig = self.props.getCoreDbConfig() - self.exe_name = "OpenSim.exe" + self.exe_name = "Halcyon.exe" # self.exe_args = "--console rest" self.exe_args = "" diff --git a/src/inworldz/maestro/System.py b/src/inworldz/maestro/System.py index 439226c..fcbbb86 100644 --- a/src/inworldz/maestro/System.py +++ b/src/inworldz/maestro/System.py @@ -128,7 +128,7 @@ def process_list(self): # if (len(p.cmdline()) <= 0): # continue # cmdline = p.cmdline()[0] -# if os.path.basename(cmdline) == "OpenSim.exe": +# if os.path.basename(cmdline) == "Halcyon.exe": # print cmdline # print os.path.dirname(cmdline) # print p.pid diff --git a/src/inworldz/util/network.py b/src/inworldz/util/network.py index 2e1a721..5fb624c 100644 --- a/src/inworldz/util/network.py +++ b/src/inworldz/util/network.py @@ -137,11 +137,11 @@ def OpenAllFirewallPorts( for i in range(maxRegionSlots): print "Opening UDP port {0} on firewall".format(startingUdpPort + i); - FWOpenPort("OpenSim UDP {0}".format(i), startingUdpPort + i, + FWOpenPort("Halcyon UDP {0}".format(i), startingUdpPort + i, NET_FW_IP_PROTOCOL_UDP, NET_FW_SCOPE_ALL, NET_FW_IP_VERSION_ANY) print "Opening TCP port {0} on firewall".format(startingHttpPort + i) - FWOpenPort("OpenSim TCP {0}".format(i), startingHttpPort + i, + FWOpenPort("Halcyon TCP {0}".format(i), startingHttpPort + i, NET_FW_IP_PROTOCOL_TCP, NET_FW_SCOPE_ALL, NET_FW_IP_VERSION_ANY) FWOpenSubnet("Backend Subnet", backendSubnet); diff --git a/src/inworldz/util/provision.py b/src/inworldz/util/provision.py index 56e9030..a6be88a 100644 --- a/src/inworldz/util/provision.py +++ b/src/inworldz/util/provision.py @@ -94,7 +94,7 @@ def _findRegionProcess(slotnum): continue cmdline = p.cmdline()[0] if ((os.path.dirname(cmdline) == bindir) and - (os.path.basename(cmdline) == "OpenSim.exe")): + (os.path.basename(cmdline) == "Halcyon.exe")): return (p) return None diff --git a/tests/CreateRegion.py b/tests/CreateRegion.py index 351e3e6..ec682a6 100644 --- a/tests/CreateRegion.py +++ b/tests/CreateRegion.py @@ -7,7 +7,7 @@ result = session.api.Console.Command("show users") print result -region = session.api.Region.GetByName("OpenSim Test") +region = session.api.Region.GetByName("Halcyon Test") print result session.api.Region.Restart(region) diff --git a/tests/UpdateGridServices.py b/tests/UpdateGridServices.py index df092ee..71d817c 100644 --- a/tests/UpdateGridServices.py +++ b/tests/UpdateGridServices.py @@ -7,7 +7,7 @@ result = session.api.Console.Command("show users") print result -region = session.api.Region.GetByName("OpenSim Test") +region = session.api.Region.GetByName("Halcyon Test") print result session.api.Region.Restart(region) diff --git a/tests/ZooKeeperTestClient.py b/tests/ZooKeeperTestClient.py index 692a150..5c7db89 100644 --- a/tests/ZooKeeperTestClient.py +++ b/tests/ZooKeeperTestClient.py @@ -7,7 +7,7 @@ result = session.api.Console.Command("show users") print result -region = session.api.Region.GetByName("OpenSim Test") +region = session.api.Region.GetByName("Halcyon Test") print result session.api.Region.Restart(region)