[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit f28e4cf0d677776482754b45ea78f0e998c5650d
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sun Mar 31 12:24:03 2013 -0700

    Implement DeleteLoadBalancerListeners
    
    Fixes TOOLS-239

diff --git a/bin/euelb-delete-lb-listeners b/bin/euelb-delete-lb-listeners
new file mode 100755
index 0000000..165fe48
--- /dev/null
+++ b/bin/euelb-delete-lb-listeners
@@ -0,0 +1,6 @@
+#!/usr/bin/python -tt
+
+import euca2ools.commands.elasticloadbalancing.deleteloadbalancerlisteners
+
+if __name__ == '__main__':
+    euca2ools.commands.elasticloadbalancing.deleteloadbalancerlisteners.DeleteLoadBalancerListeners.run()
diff --git a/euca2ools/commands/elasticloadbalancing/setloadbalancerlistenersslcertificate.py b/euca2ools/commands/elasticloadbalancing/deleteloadbalancerlisteners.py
similarity index 69%
copy from euca2ools/commands/elasticloadbalancing/setloadbalancerlistenersslcertificate.py
copy to euca2ools/commands/elasticloadbalancing/deleteloadbalancerlisteners.py
index a2a3705..c204a89 100644
--- a/euca2ools/commands/elasticloadbalancing/setloadbalancerlistenersslcertificate.py
+++ b/euca2ools/commands/elasticloadbalancing/deleteloadbalancerlisteners.py
@@ -28,18 +28,21 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import argparse
+from euca2ools.commands.argtypes import delimited_list
 from euca2ools.commands.elasticloadbalancing import ELBRequest
 from requestbuilder import Arg
 
 
-class SetLoadBalancerListenerSSLCertificate(ELBRequest):
-    DESCRIPTION = ("Change the certificate that terminates a load balancer's"
-                   "listener's SSL connections")
+class DeleteLoadBalancerListeners(ELBRequest):
+    DESCRIPTION = ('Delete one or more listeners from a load balancer\n\nIf '
+                   'a listener named with -l/--lb-ports does not exist, this '
+                   'command still succeeds.')
     ARGS = [Arg('LoadBalancerName', metavar='ELB',
                 help='name of the load balancer to modify (required)'),
-            Arg('-l', '--lb-port', dest='LoadBalancerPort', metavar='PORT',
-                type=int, required=True,
-                help='port that should use the certificate (required)'),
-            Arg('-c', '--cert-id', dest='SSLCertificateId', metavar='ARN',
-                required=True,
-                help='ARN for the server certificate to use (required)')]
+            Arg('-l', '--lb-ports', dest='LoadBalancerPorts.member',
+                metavar='PORT1,PORT2,...', required=True,
+                type=delimited_list(',', item_type=int),
+                help='port numbers of the listeners to remove (required)'),
+            Arg('--force', action='store_true', route_to=None,
+                help=argparse.SUPPRESS)]  # for compatibility

-- 
managing cloud instances for Eucalyptus