From 9e8009b8cbe22eff46c6783c1191ffcabfbefbd7 Mon Sep 17 00:00:00 2001 From: Jedrzej Nowak Date: Mon, 23 Nov 2015 17:23:45 +0100 Subject: [PATCH] Renamed solard to solar_agent, moved transports and examples --- examples/riak/riaks.py | 26 +++++++++---------- examples/{solard => solar_agent}/example.py | 18 ++++++------- .../actions/run.yaml | 0 .../actions/update.yaml | 0 .../meta.yaml | 0 solar/solar/core/actions.py | 6 ++--- solar/solar/core/handlers/ansible_template.py | 2 +- solar/solar/core/signals.py | 2 +- solar/solar/core/transports/bat.py | 16 ++++++------ ..._transport.py => solar_agent_transport.py} | 18 ++++++------- 10 files changed, 44 insertions(+), 44 deletions(-) rename examples/{solard => solar_agent}/example.py (71%) rename resources/{transport_solard => transport_solar_agent}/actions/run.yaml (100%) rename resources/{transport_solard => transport_solar_agent}/actions/update.yaml (100%) rename resources/{transport_solard => transport_solar_agent}/meta.yaml (100%) rename solar/solar/core/transports/{solard_transport.py => solar_agent_transport.py} (78%) diff --git a/examples/riak/riaks.py b/examples/riak/riaks.py index cba9ac2d..c5e8c42e 100755 --- a/examples/riak/riaks.py +++ b/examples/riak/riaks.py @@ -206,26 +206,26 @@ def setup_haproxies(): @click.command() @click.argument('i', type=int, required=True) -def add_solard(i): - solard_transport = vr.create('solard_transport%s' % i, 'resources/transport_solard', - {'solard_user': 'vagrant', - 'solard_password': 'password'})[0] +def add_solar_agent(i): + solar_agent_transport = vr.create('solar_agent_transport%s' % i, 'resources/transport_solar_agent', + {'solar_agent_user': 'vagrant', + 'solar_agent_password': 'password'})[0] transports = resource.load('transports%s' % i) ssh_transport = resource.load('ssh_transport%s' % i) - transports_for_solard = vr.create('transports_for_solard%s' % i, 'resources/transports')[0] + transports_for_solar_agent = vr.create('transports_for_solar_agent%s' % i, 'resources/transports')[0] - # install solard with ssh - signals.connect(transports_for_solard, solard_transport, {}) + # install solar_agent with ssh + signals.connect(transports_for_solar_agent, solar_agent_transport, {}) - signals.connect(ssh_transport, transports_for_solard, {'ssh_key': 'transports:key', + signals.connect(ssh_transport, transports_for_solar_agent, {'ssh_key': 'transports:key', 'ssh_user': 'transports:user', 'ssh_port': 'transports:port', 'name': 'transports:name'}) - # add solard to transports on this node - signals.connect(solard_transport, transports, {'solard_user': 'transports:user', - 'solard_port': 'transports:port', - 'solard_password': 'transports:password', + # add solar_agent to transports on this node + signals.connect(solar_agent_transport, transports, {'solar_agent_user': 'transports:user', + 'solar_agent_port': 'transports:port', + 'solar_agent_password': 'transports:password', 'name': 'transports:name'}) @@ -252,7 +252,7 @@ def undeploy(): main.add_command(deploy) main.add_command(undeploy) main.add_command(add_haproxies) -main.add_command(add_solard) +main.add_command(add_solar_agent) if __name__ == '__main__': diff --git a/examples/solard/example.py b/examples/solar_agent/example.py similarity index 71% rename from examples/solard/example.py rename to examples/solar_agent/example.py index d58af9ca..3bc248ca 100644 --- a/examples/solard/example.py +++ b/examples/solar_agent/example.py @@ -17,18 +17,18 @@ def run(): })[0] transports = vr.create('transports_node1', 'resources/transports')[0] - transports_for_solard = vr.create('transports_for_solard', 'resources/transports')[0] + transports_for_solar_agent = vr.create('transports_for_solar_agent', 'resources/transports')[0] ssh_transport = vr.create('ssh_transport', 'resources/transport_ssh', {'ssh_key': '/vagrant/.vagrant/machines/solar-dev1/virtualbox/private_key', 'ssh_user': 'vagrant'})[0] - solard_transport = vr.create('solard_transport', 'resources/transport_solard', - {'solard_user': 'vagrant', - 'solard_password': 'password'})[0] + solar_agent_transport = vr.create('solar_agent_transport', 'resources/transport_solar_agent', + {'solar_agent_user': 'vagrant', + 'solar_agent_password': 'password'})[0] - transports_for_solard.connect(solard_transport, {}) - ssh_transport.connect(transports_for_solard,{'ssh_key': 'transports:key', + transports_for_solar_agent.connect(solar_agent_transport, {}) + ssh_transport.connect(transports_for_solar_agent,{'ssh_key': 'transports:key', 'ssh_user': 'transports:user', 'ssh_port': 'transports:port', 'name': 'transports:name'}) @@ -40,9 +40,9 @@ def run(): 'ssh_user': 'transports:user', 'ssh_port': 'transports:port', 'name': 'transports:name'}) - solard_transport.connect(transports, {'solard_user': 'transports:user', - 'solard_port': 'transports:port', - 'solard_password': 'transports:password', + solar_agent_transport.connect(transports, {'solar_agent_user': 'transports:user', + 'solar_agent_port': 'transports:port', + 'solar_agent_password': 'transports:password', 'name': 'transports:name'}) diff --git a/resources/transport_solard/actions/run.yaml b/resources/transport_solar_agent/actions/run.yaml similarity index 100% rename from resources/transport_solard/actions/run.yaml rename to resources/transport_solar_agent/actions/run.yaml diff --git a/resources/transport_solard/actions/update.yaml b/resources/transport_solar_agent/actions/update.yaml similarity index 100% rename from resources/transport_solard/actions/update.yaml rename to resources/transport_solar_agent/actions/update.yaml diff --git a/resources/transport_solard/meta.yaml b/resources/transport_solar_agent/meta.yaml similarity index 100% rename from resources/transport_solard/meta.yaml rename to resources/transport_solar_agent/meta.yaml diff --git a/solar/solar/core/actions.py b/solar/solar/core/actions.py index 5faac2ce..65603e38 100644 --- a/solar/solar/core/actions.py +++ b/solar/solar/core/actions.py @@ -17,7 +17,7 @@ import handlers # from solar.core.transports.ssh import SSHSyncTransport, SSHRunTransport # from solar.core.transports.rsync import RsyncSyncTransport -# from solar.core.transports.solard_transport import SolardRunTransport, SolardSyncTransport +# from solar.core.transports.solar_agent_transport import SolarAgentRunTransport, SolarAgentSyncTransport from solar.core.transports.bat import BatRunTransport, BatSyncTransport @@ -25,8 +25,8 @@ _default_transports = { # 'sync': RsyncSyncTransport, # 'sync': SSHSyncTransport, # 'run': SSHRunTransport, - # 'run': SolardRunTransport, - # 'sync': SolardSyncTransport + # 'run': SolarAgentRunTransport, + # 'sync': SolarAgentSyncTransport 'run': BatRunTransport, 'sync': BatSyncTransport } diff --git a/solar/solar/core/handlers/ansible_template.py b/solar/solar/core/handlers/ansible_template.py index 9a4507cf..5d87416c 100644 --- a/solar/solar/core/handlers/ansible_template.py +++ b/solar/solar/core/handlers/ansible_template.py @@ -24,7 +24,7 @@ from solar import errors env.warn_only = True -# if we would have something like solard that would render this then +# if we would have something like solar_agent that would render this then # we would not need to render it there # for now we redender it locally, sync to remote, run ansible on remote host as local class AnsibleTemplate(TempFileHandler): diff --git a/solar/solar/core/signals.py b/solar/solar/core/signals.py index 9a92f8c0..40492867 100644 --- a/solar/solar/core/signals.py +++ b/solar/solar/core/signals.py @@ -91,7 +91,7 @@ def location_and_transports(emitter, receiver, orig_mapping): return if emitter_single.get('is_emit') is False: # this case is when we connect resource to transport itself - # like adding ssh_transport for solard_transport and we don't want then + # like adding ssh_transport for solar_agent_transport and we don't want then # transports_id to be messed # it forbids passing this value around # log.debug("Disabled %r mapping for %r", single, emitter.name) diff --git a/solar/solar/core/transports/bat.py b/solar/solar/core/transports/bat.py index 3814738c..b21e9715 100644 --- a/solar/solar/core/transports/bat.py +++ b/solar/solar/core/transports/bat.py @@ -2,11 +2,11 @@ from solar.core.transports.base import SyncTransport, RunTransport, SolarTranspo from solar.core.transports.ssh import SSHSyncTransport, SSHRunTransport from solar.core.transports.rsync import RsyncSyncTransport try: - from solar.core.transports.solard_transport import SolardRunTransport, SolardSyncTransport + from solar.core.transports.solar_agent_transport import SolarAgentRunTransport, SolarAgentSyncTransport except ImportError: - _solard_available = False + _solar_agent_available = False else: - _solard_available = True + _solar_agent_available = True try: from solar.core.transports.torrent import TorrentSyncTransport @@ -29,9 +29,9 @@ KNOWN_RUN_TRANSPORTS = { if _torrent_available: KNOWN_SYNC_TRANSPORTS['torrent'] = TorrentSyncTransport -if _solard_available: - KNOWN_SYNC_TRANSPORTS['solard'] = SolardSyncTransport - KNOWN_RUN_TRANSPORTS['solard'] = SolardRunTransport +if _solar_agent_available: + KNOWN_SYNC_TRANSPORTS['solar_agent'] = SolarAgentSyncTransport + KNOWN_RUN_TRANSPORTS['solar_agent'] = SolarAgentRunTransport class OnAll(object): @@ -87,7 +87,7 @@ class BatTransport(SolarTransport): class BatSyncTransport(SyncTransport, BatTransport): preffered_transport_name = None - _order = ('torrent', 'solard', 'rsync', 'ssh') + _order = ('torrent', 'solar_agent', 'rsync', 'ssh') _bat_transports = KNOWN_SYNC_TRANSPORTS def __init__(self, *args, **kwargs): @@ -105,7 +105,7 @@ class BatSyncTransport(SyncTransport, BatTransport): class BatRunTransport(RunTransport, BatTransport): preffered_transport_name = None - _order = ('solard', 'ssh') + _order = ('solar_agent', 'ssh') _bat_transports = KNOWN_RUN_TRANSPORTS def __init__(self, *args, **kwargs): diff --git a/solar/solar/core/transports/solard_transport.py b/solar/solar/core/transports/solar_agent_transport.py similarity index 78% rename from solar/solar/core/transports/solard_transport.py rename to solar/solar/core/transports/solar_agent_transport.py index e1d76993..985b2c3a 100644 --- a/solar/solar/core/transports/solard_transport.py +++ b/solar/solar/core/transports/solar_agent_transport.py @@ -13,13 +13,13 @@ # under the License. -from solard.client import SolardClient +from solar_agent.client import SolarAgentClient from solar.core.transports.base import RunTransport, SyncTransport, Executor, SolarRunResult from solar.core.log import log -class SolardTransport(object): +class SolarAgentTransport(object): def get_client(self, resource): transport = self.get_transport_data(resource) @@ -28,18 +28,18 @@ class SolardTransport(object): port = transport['port'] auth = transport['password'] transport_class = transport.get('transport_class') - client = SolardClient(auth={'user': user, 'auth': auth}, + client = SolarAgentClient(auth={'user': user, 'auth': auth}, transport_args=(host, port), transport_class=transport_class) return client -class SolardSyncTransport(SyncTransport, SolardTransport): +class SolarAgentSyncTransport(SyncTransport, SolarAgentTransport): - preffered_transport_name = 'solard' + preffered_transport_name = 'solar_agent' def copy(self, resource, _from, _to, use_sudo=False): - log.debug("Solard copy: %s -> %s", _from, _to) + log.debug("SolarAgent copy: %s -> %s", _from, _to) client = self.get_client(resource) executor = lambda transport: client.copy(_from, _to, use_sudo) @@ -49,15 +49,15 @@ class SolardSyncTransport(SyncTransport, SolardTransport): self.executors.append(executor) -class SolardRunTransport(RunTransport, SolardTransport): +class SolarAgentRunTransport(RunTransport, SolarAgentTransport): - preffered_transport_name = 'solard' + preffered_transport_name = 'solar_agent' def get_result(self, result): return SolarRunResult(result) def run(self, resource, *args, **kwargs): - log.debug("Solard run: %s", args) + log.debug("SolarAgent run: %s", args) client = self.get_client(resource) res = client.run(' '.join(args), **kwargs) return self.get_result(res)