← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ironic/vivid-updates

« back to all changes in this revision

Viewing changes to ironic/api/controllers/v1/chassis.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2015-03-30 11:14:57 UTC
  • mfrom: (1.2.6)
  • Revision ID: package-import@ubuntu.com-20150330111457-kr4ju3guf22m4vbz
Tags: 2015.1~b3-0ubuntu1
https://launchpad.net/bugs/1358820
https://launchpad.net/bugs/1429962
* New upstream release.
  + d/control: 
    - Align with upstream dependencies.
    - Add dh-python to build-dependencies.
    - Add psmisc as a dependency. (LP: #1358820)
  + d/p/fix-requirements.patch: Rediffed.
  + d/ironic-conductor.init.in: Fixed typos in LSB headers,
    thanks to JJ Asghar. (LP: #1429962)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ironic/api/controllers/v1/chassis.py
81
81
                                                 'chassis',
82
82
                                                 chassis.uuid + "/nodes",
83
83
                                                 bookmark=True)
84
 
                            ]
 
84
                             ]
85
85
        chassis.links = [link.Link.make_link('self',
86
86
                                             url,
87
87
                                             'chassis', chassis.uuid),
89
89
                                             url,
90
90
                                             'chassis', chassis.uuid,
91
91
                                             bookmark=True)
92
 
                        ]
 
92
                         ]
93
93
        return chassis
94
94
 
95
95
    @classmethod
186
186
        :param sort_key: column to sort results by. Default: id.
187
187
        :param sort_dir: direction to sort. "asc" or "desc". Default: asc.
188
188
        """
189
 
        # /detail should only work agaist collections
 
189
        # /detail should only work against collections
190
190
        parent = pecan.request.path.split('/')[:-1][-1]
191
191
        if parent != "chassis":
192
192
            raise exception.HTTPNotFound