Revision 2899d9de lib/bdev.py

b/lib/bdev.py
1253 1253 
        res_r = self._AssembleNet(minor,
1254 1254 
                                  (self._lhost, self._lport,
1255 1255 
                                   self._rhost, self._rport),
1256 
                                  "C")
1256 
                                  "C", hmac=constants.DRBD_HMAC_ALG,
1257 
                                  secret=self._secret
1258 
                                  )
1257 1259 
        if res_r:
1258 1260 
          if self._MatchesNet(self._GetDevInfo(self._GetShowData(minor))):
1259 1261 
            break
......
1281 1283 
        # local storage (i.e. one or more of the _[lr](host|port) is
1282 1284 
        # None)
1283 1285 
        if (self._AssembleNet(minor, (self._lhost, self._lport,
1284 
                                      self._rhost, self._rport), "C") and
1286 
                                      self._rhost, self._rport), "C",
1287 
                              hmac=constants.DRBD_HMAC_ALG,
1288 
                              secret=self._secret) and
1285 1289 
            self._MatchesNet(self._GetDevInfo(self._GetShowData(minor)))):
1286 1290 
          break
1287 1291 

  		





  ......




  1333
  1337
  
    
      result = self._AssembleNet(minor,


  		





  1334
  1338
  
    
                                 (self._lhost, self._lport,


  		





  1335
  1339
  
    
                                  self._rhost, self._rport),


  		





  1336
  
  
    
                                 "C")


  		





  
  1340
  
    
                                 "C", hmac=constants.DRBD_HMAC_ALG,


  		





  
  1341
  
    
                                 secret=self._secret)


  		





  1337
  1342
  
    
      if not result:


  		





  1338
  1343
  
    
        if need_localdev_teardown:


  		





  1339
  1344
  
    
          # we will ignore failures from this


  		












Also available in:
  Unified diff