Merge "Move _filter_non_model_columns method to CommonDbMixin"

Author: Jenkins

neutron/db/db_base_plugin_v2.py

@@ -217,6 +217,14 @@ def _get_marker_obj(self, context, resource, limit, marker):
             return getattr(self, '_get_%s' % resource)(context, marker)
         return None
 
+    def _filter_non_model_columns(self, data, model):
+        """Remove all the attributes from data which are not columns of
+        the model passed as second parameter.
+        """
+        columns = [c.name for c in model.__table__.columns]
+        return dict((k, v) for (k, v) in
+                    data.iteritems() if k in columns)
+
 
 class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
                         CommonDbMixin):
@@ -255,14 +263,6 @@ def register_dict_extend_funcs(cls, resource, funcs):
         cur_funcs.extend(funcs)
         cls._dict_extend_functions[resource] = cur_funcs
 
-    def _filter_non_model_columns(self, data, model):
-        """Remove all the attributes from data which are not columns of
-        the model passed as second parameter.
-        """
-        columns = [c.name for c in model.__table__.columns]
-        return dict((k, v) for (k, v) in
-                    data.iteritems() if k in columns)
-
     def _get_network(self, context, id):
         try:
             network = self._get_by_id(context, models_v2.Network, id)