← Back to branch summary

~ubuntu-branches/ubuntu/raring/quantum/raring-proposed

« back to all changes in this revision

Viewing changes to quantum/plugins/nec/common/ofc_client.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Yolanda Robla, James Page, Maru Newby
  • Date: 2013-01-11 09:14:35 UTC
  • mfrom: (2.1.17)
  • Revision ID: package-import@ubuntu.com-20130111091435-vaup7dwmtmajy5oe
Tags: 2013.1~g2-0ubuntu1
https://launchpad.net/bugs/1085038
https://launchpad.net/bugs/1076747
[ Chuck Short ]
* New upstream version. 
* debian/patches/fix-quantum-configuration.patch: Refreshed.

[ Yolanda Robla ]
* debian/quantum-l3-agent.quantum-metadata-agent.upstart: Add
  upstart configuration for Metadata Agent.
* debian/quantum-l3-agent.install: Added quantum-ns-metadata-proxy,
  quantum-metadata-agent and metadata_agent.ini.
* debian/patches/fix-quantum-configuration.patch: Update rootwrap
  configuration in metadata_agent.ini file.
* debian/changelog: Updated package version
* d/p/fix-quantum-configuration.patch: refresh patches

[ James Page ]
* d/*.install: Install entry points from bin directory instead
  of easy-install ones generated during the package build process
  (LP: #1085038).
* d/control: Drop BD on python-dev-all; its not required.
* d/rules: Install multiple upstart configurations for quantum-l3-agent.
* d/control: Tidy package descriptions.
* d/*.postrm: Drop as debhelper will generate update-rc.d calls in
  maintainer scripts if required.
* d/quantum-common.postinst: Tweak permissions setting so that /etc/quantum
  is not owned/writable by the quantum user, ensure that /etc/quantum/rootwrap*
  is owned by root:root.
* d/*agent*.postinst: Dropped as permissions now correctly set in
  quantum-common.
* d/patches/fix-quantum-configuration.patch: Re-add dropped fixes rootwrap and
  sqlite defaults for all plugins.
* d/control: Added new BD on alembic (>= 0.4.1~), version python-mock >= 1.0b1.

[ Maru Newby ]
* debian/control: Remove unnecessary openvswitch-vswitch dependency
  from quantum-plugin-openvswitch (LP: #1076747).

Show diffs side-by-side

added added

removed removed

Lines of Context:
quantum/plugins/nec/common/ofc_client.py
17
17
 
18
18
import httplib
19
19
import json
20
 
import logging
21
20
import socket
22
21
 
 
22
from quantum.openstack.common import log as logging
23
23
from quantum.plugins.nec.common import exceptions as nexc
24
24
 
25
25
 
54
54
            return httplib.HTTPConnection
55
55
 
56
56
    def do_request(self, method, action, body=None):
57
 
        LOG.debug("Client request: %s %s [%s]" % (method, action, str(body)))
 
57
        LOG.debug(_("Client request: %(method)s %(action)s [%(body)s]"),
 
58
                  locals())
58
59
 
59
60
        if type(body) is dict:
60
61
            body = json.dumps(body)
71
72
            conn.request(method, action, body, headers)
72
73
            res = conn.getresponse()
73
74
            data = res.read()
74
 
            LOG.debug("OFC returns [%s:%s]" % (str(res.status), data))
 
75
            LOG.debug(_("OFC returns [%(status)s:%(data)s]"),
 
76
                      {'status': res.status,
 
77
                       'data': data})
75
78
            if res.status in (httplib.OK,
76
79
                              httplib.CREATED,
77
80
                              httplib.ACCEPTED,
82
85
                reason = _("An operation on OFC is failed.")
83
86
                raise nexc.OFCException(reason=reason)
84
87
        except (socket.error, IOError), e:
85
 
            reason = _("Failed to connect OFC : %s" % str(e))
 
88
            reason = _("Failed to connect OFC : %s") % str(e)
86
89
            LOG.error(reason)
87
90
            raise nexc.OFCException(reason=reason)
88
91