[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 68c5c3a7244609a41596900a51ef27d0153c0a60
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sat Apr 28 15:24:41 2012 -0700

    Rewrite (Un)monitorInstances

diff --git a/bin/euca-monitor-instances b/bin/euca-monitor-instances
index 81cb411..8f66477 100755
--- a/bin/euca-monitor-instances
+++ b/bin/euca-monitor-instances
@@ -1,42 +1,6 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms, with or
-# without modification, are permitted provided that the following conditions
-# are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer in the documentation and/or other
-#   materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-#         Mitch Garnaat mgarnaat at eucalyptus.com
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euca.monitorinstances
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.monitorinstances.MonitorInstances()
-    cmd.main_cli()
-
+    euca2ools.commands.euca.monitorinstances.MonitorInstances().do_cli()
diff --git a/bin/euca-unmonitor-instances b/bin/euca-unmonitor-instances
index 95a0a48..e78d2a7 100755
--- a/bin/euca-unmonitor-instances
+++ b/bin/euca-unmonitor-instances
@@ -1,42 +1,6 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms, with or
-# without modification, are permitted provided that the following conditions
-# are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer in the documentation and/or other
-#   materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-#         Mitch Garnaat mgarnaat at eucalyptus.com
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euca.unmonitorinstances
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.unmonitorinstances.UnmonitorInstances()
-    cmd.main_cli()
-
+    euca2ools.commands.euca.unmonitorinstances.UnmonitorInstances().do_cli()
diff --git a/euca2ools/commands/euca/monitorinstances.py b/euca2ools/commands/euca/monitorinstances.py
index 91c960f..36e449a 100644
--- a/euca2ools/commands/euca/monitorinstances.py
+++ b/euca2ools/commands/euca/monitorinstances.py
@@ -1,6 +1,6 @@
 # Software License Agreement (BSD License)
 #
-# Copyright (c) 20092011, Eucalyptus Systems, Inc.
+# Copyright (c) 2009-2012, Eucalyptus Systems, Inc.
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms, with or
@@ -27,30 +27,18 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-#         Mitch Garnaat mgarnaat at eucalyptus.com
-
-import euca2ools.commands.eucacommand
-from boto.roboto.param import Param
-
-class MonitorInstances(euca2ools.commands.eucacommand.EucaCommand):
-
-    Description = 'Enables monitoring for running instances.'
-    Args = [Param(name='instance_id', ptype='string',
-                  optional=False, cardinality='+',
-                  doc='unique identifier for instance to monitor')]
 
-    def display_monitor_info(self, info):
-        for item in info:
-            print '%s\t%s' % (item.id, item.state)
-            
-    def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'monitor_instances',
-                                     instance_ids=self.instance_id)
+from requestbuilder import Arg
+from . import EucalyptusRequest
 
-    def main_cli(self):
-        info = self.main()
-        self.display_monitor_info(info)
+class MonitorInstances(EucalyptusRequest):
+    Description = 'Enable monitoring for one or more instances'
+    Args = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
+                help='instance(s) to monitor')]
+    ListMarkers = ['instancesSet']
+    ItemMarkers = ['item']
 
+    def print_result(self, result):
+        for instance in result.get('instancesSet', []):
+            print self.tabify((instance.get('instanceId'), 'monitoring-' +
+                    instance.get('monitoring', {}).get('state')))
diff --git a/euca2ools/commands/euca/unmonitorinstances.py b/euca2ools/commands/euca/unmonitorinstances.py
index 48d00ba..98eb9c1 100644
--- a/euca2ools/commands/euca/unmonitorinstances.py
+++ b/euca2ools/commands/euca/unmonitorinstances.py
@@ -1,6 +1,6 @@
 # Software License Agreement (BSD License)
 #
-# Copyright (c) 20092011, Eucalyptus Systems, Inc.
+# Copyright (c) 2009-2012, Eucalyptus Systems, Inc.
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms, with or
@@ -27,30 +27,18 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-#         Mitch Garnaat mgarnaat at eucalyptus.com
-
-import euca2ools.commands.eucacommand
-from boto.roboto.param import Param
-
-class UnmonitorInstances(euca2ools.commands.eucacommand.EucaCommand):
-
-    Description = 'Disables monitoring for running instances.'
-    Args = [Param(name='instance_id', ptype='string',
-                  optional=False, cardinality='+',
-                  doc='unique identifier for instance to stop monitoring')]
 
-    def display_monitor_info(self, info):
-        for item in info:
-            print '%s\t%s' % (item.id, item.state)
-            
-    def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'unmonitor_instances',
-                                     instance_ids=self.instance_id)
+from requestbuilder import Arg
+from . import EucalyptusRequest
 
-    def main_cli(self):
-        info = self.main()
-        self.display_monitor_info(info)
+class UnmonitorInstances(EucalyptusRequest):
+    Description = 'Disable monitoring for one or more instances'
+    Args = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
+                help='instance(s) to un-monitor')]
+    ListMarkers = ['instancesSet']
+    ItemMarkers = ['item']
 
+    def print_result(self, result):
+        for instance in result.get('instancesSet', []):
+            print self.tabify((instance.get('instanceId'), 'monitoring-' +
+                    instance.get('monitoring', {}).get('state')))

-- 
managing cloud instances for Eucalyptus