Add '..' to range operators

The perl-style range operator exists in some tools, we
might as well support that alongside the usual '-'
operator and ':' python style operator.

confluent_server/confluent/discovery/handlers/smm.py

@@ -90,6 +90,13 @@ class NodeHandler(bmchandler.NodeHandler):
             smmip = smmip[-1][0]
             if smmip and ':' in smmip:
                 raise exc.NotImplementedException('IPv6 not supported')
+            wc.request('POST', '/data', 'get=hostname')
+            rsp = wc.getresponse()
+            rspdata = fromstring(util.stringify(rsp.read()))
+            currip = rspdata.find('netConfig').find('ifConfigEntries').find(
+                'ifConfig').find('v4IPAddr').text
+            if currip == smmip:
+                return
             netconfig = netutil.get_nic_config(cfg, nodename, ip=smmip)
             netmask = netutil.cidr_to_mask(netconfig['prefix'])
             setdata = 'set=ifIndex:0,v4DHCPEnabled:0,v4IPAddr:{0},v4NetMask:{1}'.format(smmip, netmask)

confluent_server/confluent/noderange.py

@@ -250,6 +250,8 @@ class NodeRange(object):
                 return nodes
         if ':' in element:  # : range for less ambiguity
             return self.expandrange(element, ':')
+        elif '..' in element:
+            return self.expandrange(element, '..')
         elif '-' in element:
             return self.expandrange(element, '-')
         elif '+' in element:

confluent_server/confluent/plugins/shell/ssh.py

@@ -99,7 +99,7 @@ class SshShell(conapi.Console):
     def recvdata(self):
         while self.connected:
             pendingdata = self.shell.recv(8192)
-            if pendingdata == '':
+            if not pendingdata:
                 self.datacallback(conapi.ConsoleEvent.Disconnect)
                 return
             self.datacallback(pendingdata)
@@ -169,11 +169,11 @@ class SshShell(conapi.Console):
             self.datacallback(conapi.ConsoleEvent.Disconnect)
             return
         elif self.inputmode == -1:
-            while len(data) and data[0] == b'\x7f' and len(self.keyaction):
+            while len(data) and data[0:1] == b'\x7f' and len(self.keyaction):
                 self.datacallback('\b \b')  # erase previously echoed value
                 self.keyaction = self.keyaction[:-1]
                 data = data[1:]
-            while len(data) and data[0] == b'\x7f':
+            while len(data) and data[0:1] == b'\x7f':
                 data = data[1:]
             while b'\x7f' in data:
                 delidx = data.index(b'\x7f')
@@ -195,11 +195,11 @@ class SshShell(conapi.Console):
             elif len(data) > 0:
                 self.datacallback(data)
         elif self.inputmode == 0:
-            while len(data) and data[0] == b'\x7f' and len(self.username):
+            while len(data) and data[0:1] == b'\x7f' and len(self.username):
                 self.datacallback('\b \b')  # erase previously echoed value
                 self.username = self.username[:-1]
                 data = data[1:]
-            while len(data) and data[0] == b'\x7f':
+            while len(data) and data[0:1] == b'\x7f':
                 data = data[1:]
             while b'\x7f' in data:
                 delidx = data.index(b'\x7f')
@@ -216,7 +216,7 @@ class SshShell(conapi.Console):
                 # echo back typed data
                 self.datacallback(data)
         elif self.inputmode == 1:
-            while len(data) > 0 and data[0] == b'\x7f':
+            while len(data) > 0 and data[0:1] == b'\x7f':
                 self.password = self.password[:-1]
                 data = data[1:]
             while b'\x7f' in data:
@@ -237,4 +237,4 @@ class SshShell(conapi.Console):
 
 def create(nodes, element, configmanager, inputdata):
     if len(nodes) == 1:
-        return SshShell(nodes[0], configmanager)
+        return SshShell(nodes[0], configmanager)