Merge lp:~fwereade/pyjuju/orchestra-port-no-ops into lp:pyjuju

[William Reade]

Should be trivial again; we don't have any current plans for a firewalling solution for Orchestra, so for now it seems sensible not to allow this to block further testing and deployment.

[Kapil Thangavelu (hazmat)]

seems fine for now, we'll need to migrate this to machine agent/level firewalling at some poing

review: Approve

[William Reade (fwereade)]

> seems fine for now, we'll need to migrate this to machine agent/level
> firewalling at some poing

filed lp:833064

[Gustavo Niemeyer (niemeyer)]

LGTM

review: Approve

=== modified file 'ensemble/providers/orchestra/__init__.py'
--- ensemble/providers/orchestra/__init__.py	2011-08-17 12:04:56 +0000
+++ ensemble/providers/orchestra/__init__.py	2011-08-23 16:21:51 +0000
@@ -1,4 +1,6 @@
-from twisted.internet.defer import inlineCallbacks, returnValue
+import logging
+
+from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 
 from ensemble.providers.common.base import MachineProviderBase
 
@@ -7,6 +9,8 @@
 from .launch import OrchestraLaunchMachine
 from .machine import machine_from_dict
 
+log = logging.getLogger("ensemble.orchestra")
+
 
 class MachineProvider(MachineProviderBase):
 
@@ -45,3 +49,19 @@
         """
         instances = yield self.cobbler.describe_systems(*instance_ids)
         returnValue([machine_from_dict(i) for i in instances])
+
+    def open_port(self, machine, machine_id, port, protocol="tcp"):
+        """Authorizes `port` using `protocol` for `machine`."""
+        log.warn("Firewalling is not yet implemented in Orchestra")
+        return succeed(None)
+
+    def close_port(self, machine, machine_id, port, protocol="tcp"):
+        """Revokes `port` using `protocol` for `machine`."""
+        log.warn("Firewalling is not yet implemented in Orchestra")
+        return succeed(None)
+
+    def get_opened_ports(self, machine, machine_id):
+        """Returns a set of open (port, protocol) pairs for `machine`."""
+        log.warn("Firewalling is not yet implemented in Orchestra")
+        return succeed(None)
+

=== modified file 'ensemble/providers/orchestra/tests/test_provider.py'
--- ensemble/providers/orchestra/tests/test_provider.py	2011-08-12 20:31:16 +0000
+++ ensemble/providers/orchestra/tests/test_provider.py	2011-08-23 16:21:51 +0000
@@ -1,3 +1,5 @@
+from twisted.internet.defer import inlineCallbacks
+
 from ensemble.environment.errors import EnvironmentsConfigError
 from ensemble.lib.testing import TestCase
 from ensemble.providers.orchestra import MachineProvider
@@ -52,3 +54,25 @@
         error = self.assertRaises(EnvironmentsConfigError,
                                   MachineProvider, "some-env-name", config)
         self.assertIn("authorized-keys", str(error))
+
+    @inlineCallbacks
+    def test_open_port(self):
+        log = self.capture_logging("ensemble.orchestra")
+        yield MachineProvider("blah", CONFIG).open_port(None, None, None)
+        self.assertIn(
+            "Firewalling is not yet implemented in Orchestra", log.getvalue())
+
+    @inlineCallbacks
+    def test_close_port(self):
+        log = self.capture_logging("ensemble.orchestra")
+        yield MachineProvider("blah", CONFIG).close_port(None, None, None)
+        self.assertIn(
+            "Firewalling is not yet implemented in Orchestra", log.getvalue())
+
+    @inlineCallbacks
+    def test_get_opened_ports(self):
+        log = self.capture_logging("ensemble.orchestra")
+        yield MachineProvider("blah", CONFIG).get_opened_ports(None, None)
+        self.assertIn(
+            "Firewalling is not yet implemented in Orchestra", log.getvalue())
+