← Back to branch summary

~salvatore-orlando/neutron/quantum-api-auth

« back to all changes in this revision

Viewing changes to quantum/plugins/openvswitch/ovs_quantum_plugin.py

  • Committer: Salvatore Orlando
  • Date: 2011-08-30 16:06:19 UTC
  • mfrom: (37.1.22 quantum-835216)
  • Revision ID: salvatore.orlando@eu.citrix.com-20110830160619-ay4jfkz9lsy56t0h
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
quantum/plugins/openvswitch/ovs_quantum_plugin.py
133
133
 
134
134
        # Verify that no attachments are plugged into the network
135
135
        for port in db.port_list(net_id):
136
 
            if port['interface_id']:
 
136
            if port.interface_id:
137
137
                raise q_exc.NetworkInUse(net_id=net_id)
138
138
        net = db.network_destroy(net_id)
139
139
        ovs_db.remove_vlan_binding(net_id)
150
150
        return self._make_net_dict(str(net.uuid), net.name, None)
151
151
 
152
152
    def _make_port_dict(self, port_id, port_state, net_id, attachment):
153
 
        res = {'port-id': port_id,
154
 
               'port-state': port_state}
155
 
        if net_id:
156
 
            res['net-id'] = net_id
157
 
        if attachment:
158
 
            res['attachment-id'] = attachment
159
 
        return res
 
153
        return {'port-id': port_id,
 
154
                'port-state': port_state,
 
155
                'net-id': net_id,
 
156
                'attachment': attachment}
160
157
 
161
158
    def get_all_ports(self, tenant_id, net_id):
162
159
        ids = []
163
160
        ports = db.port_list(net_id)
164
161
        for p in ports:
165
162
            LOG.debug("Appending port: %s" % p.uuid)
166
 
            d = self._make_port_dict(str(p.uuid), p.state, None, None)
 
163
            d = self._make_port_dict(str(p.uuid), p.state, p.network_id,
 
164
                                                    p.interface_id)
167
165
            ids.append(d)
168
166
        return ids
169
167
 
170
168
    def create_port(self, tenant_id, net_id, port_state=None):
171
169
        LOG.debug("Creating port with network_id: %s" % net_id)
172
170
        port = db.port_create(net_id, port_state)
173
 
        return self._make_port_dict(str(port.uuid), port.state, None, None)
 
171
        return self._make_port_dict(str(port.uuid), port.state,
 
172
                                        port.network_id, port.interface_id)
174
173
 
175
174
    def delete_port(self, tenant_id, net_id, port_id):
176
175
        port = db.port_destroy(port_id, net_id)
177
 
        return self._make_port_dict(str(port.uuid), port.state, None, None)
 
176
        return self._make_port_dict(str(port.uuid), port.state,
 
177
                                        port.network_id, port.interface_id)
178
178
 
179
179
    def update_port(self, tenant_id, net_id, port_id, port_state):
180
180
        """
183
183
        LOG.debug("update_port() called\n")
184
184
        port = db.port_get(port_id, net_id)
185
185
        db.port_set_state(port_id, net_id, port_state)
186
 
        return self._make_port_dict(str(port.uuid), port.state, None, None)
 
186
        return self._make_port_dict(str(port.uuid), port.state,
 
187
                                        port.network_id, port.interface_id)
187
188
 
188
189
    def get_port_details(self, tenant_id, net_id, port_id):
189
190
        port = db.port_get(port_id, net_id)