← Back to branch summary

~zulcss/ubuntu/precise/quantum/trunk

« back to all changes in this revision

Viewing changes to quantum/plugins/cisco/services/services_logistics.py

  • Committer: Chuck Short
  • Date: 2012-11-26 19:51:11 UTC
  • mfrom: (26.1.1 raring-proposed)
  • Revision ID: zulcss@ubuntu.com-20121126195111-jnz2cr4xi6whemw2
* New upstream release for the Ubuntu Cloud Archive.
* debian/patches/*: Refreshed for opening of Grizzly.
* New upstream release.
* debian/rules: FTFBS if there is missing binaries.
* debian/quantum-server.install: Add quantum-debug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
quantum/plugins/cisco/services/services_logistics.py
24
24
import subprocess
25
25
import time
26
26
 
 
27
from quantum.common import utils
27
28
from quantum.openstack.common import importutils
28
29
from quantum.plugins.cisco.common import cisco_constants as const
29
30
from quantum.plugins.cisco.db import services_db as sdb
54
55
            while not flag and counter <= 5:
55
56
                counter = counter + 1
56
57
                time.sleep(2.5)
57
 
                process = subprocess.Popen(service_args,
58
 
                                           stdout=subprocess.PIPE)
 
58
                process = utils.subprocess_popen(service_args,
 
59
                                                 stdout=subprocess.PIPE)
59
60
                result = process.stdout.readlines()
60
61
                if not result:
61
62
                    flag = True
75
76
            while not flag and counter <= 10:
76
77
                counter = counter + 1
77
78
                time.sleep(2.5)
78
 
                process = subprocess.Popen(service_args,
79
 
                                           stdout=subprocess.PIPE)
 
79
                process = utils.subprocess_popen(service_args,
 
80
                                                 stdout=subprocess.PIPE)
80
81
                result = process.stdout.readlines()
81
82
                if result:
82
83
                    tokens = re.search("running", str(result[1]))