s/queryset/get_queryset/ in admin.py of services using proxy models
diff --git a/xos/services/ceilometer/admin.py b/xos/services/ceilometer/admin.py
index 7ca5c2c..a226bef 100644
--- a/xos/services/ceilometer/admin.py
+++ b/xos/services/ceilometer/admin.py
@@ -59,7 +59,7 @@
suit_form_includes = (('ceilometeradmin.html', 'top', 'administration'),
)
- def queryset(self, request):
+ def get_queryset(self, request):
return CeilometerService.get_service_objects_by_user(request.user)
class MonitoringChannelForm(forms.ModelForm):
@@ -112,7 +112,7 @@
obj.delete()
delete_selected_objects.short_description = "Delete Selected MonitoringChannel Objects"
- def queryset(self, request):
+ def get_queryset(self, request):
return MonitoringChannel.get_tenant_objects_by_user(request.user)
class SFlowServiceForm(forms.ModelForm):
@@ -164,7 +164,7 @@
suit_form_includes = (('sflowadmin.html', 'top', 'administration'),
)
- def queryset(self, request):
+ def get_queryset(self, request):
return SFlowService.get_service_objects_by_user(request.user)
class SFlowTenantForm(forms.ModelForm):
@@ -207,7 +207,7 @@
suit_form_tabs = (('general','Details'), ('tenantattrs', 'Attributes'))
- def queryset(self, request):
+ def get_queryset(self, request):
return SFlowTenant.get_tenant_objects_by_user(request.user)
admin.site.register(CeilometerService, CeilometerServiceAdmin)
diff --git a/xos/services/cord/admin.py b/xos/services/cord/admin.py
index e84ea5b..7fa174f 100644
--- a/xos/services/cord/admin.py
+++ b/xos/services/cord/admin.py
@@ -46,7 +46,7 @@
suit_form_includes = (('voltadmin.html', 'top', 'administration'),
) #('hpctools.html', 'top', 'tools') )
- def queryset(self, request):
+ def get_queryset(self, request):
return VOLTService.get_service_objects_by_user(request.user)
class VOLTTenantForm(forms.ModelForm):
@@ -91,7 +91,7 @@
suit_form_tabs = (('general','Details'),)
- def queryset(self, request):
+ def get_queryset(self, request):
return VOLTTenant.get_tenant_objects_by_user(request.user)
#-----------------------------------------------------------------------------
@@ -168,7 +168,7 @@
suit_form_includes = (('vcpeadmin.html', 'top', 'administration'),
) #('hpctools.html', 'top', 'tools') )
- def queryset(self, request):
+ def get_queryset(self, request):
return VSGService.get_service_objects_by_user(request.user)
class VSGTenantForm(forms.ModelForm):
@@ -220,7 +220,7 @@
suit_form_tabs = (('general','Details'),)
- def queryset(self, request):
+ def get_queryset(self, request):
return VSGTenant.get_tenant_objects_by_user(request.user)
#-----------------------------------------------------------------------------
@@ -272,7 +272,7 @@
suit_form_includes = (('vbngadmin.html', 'top', 'administration'),
) #('hpctools.html', 'top', 'tools') )
- def queryset(self, request):
+ def get_queryset(self, request):
return VBNGService.get_service_objects_by_user(request.user)
class VBNGTenantForm(forms.ModelForm):
@@ -319,7 +319,7 @@
suit_form_tabs = (('general','Details'),)
- def queryset(self, request):
+ def get_queryset(self, request):
return VBNGTenant.get_tenant_objects_by_user(request.user)
#-----------------------------------------------------------------------------
@@ -341,7 +341,7 @@
def selflink_reverse_path(self):
return "admin:cord_volttenant_change"
- def queryset(self, request):
+ def get_queryset(self, request):
qs = super(VOLTTenantInline, self).queryset(request)
return qs.filter(kind=VOLT_KIND)
@@ -401,7 +401,7 @@
('tenantrootprivileges','Privileges')
)
- def queryset(self, request):
+ def get_queryset(self, request):
return CordSubscriberRoot.get_tenant_objects_by_user(request.user)
admin.site.register(VOLTService, VOLTServiceAdmin)
diff --git a/xos/services/fabric/admin.py b/xos/services/fabric/admin.py
index 8ae836f..47fefd9 100644
--- a/xos/services/fabric/admin.py
+++ b/xos/services/fabric/admin.py
@@ -56,7 +56,7 @@
suit_form_includes = (('fabricadmin.html', 'top', 'administration'),
)
- def queryset(self, request):
+ def get_queryset(self, request):
return FabricService.get_service_objects_by_user(request.user)
admin.site.register(FabricService, FabricServiceAdmin)
diff --git a/xos/services/onos/admin.py b/xos/services/onos/admin.py
index 6ec2432..285e751 100644
--- a/xos/services/onos/admin.py
+++ b/xos/services/onos/admin.py
@@ -71,7 +71,7 @@
suit_form_includes = (('onosadmin.html', 'top', 'administration'),
)
- def queryset(self, request):
+ def get_queryset(self, request):
return ONOSService.get_service_objects_by_user(request.user)
class ONOSAppForm(forms.ModelForm):
@@ -117,7 +117,7 @@
suit_form_tabs = (('general','Details'), ('tenantattrs', 'Attributes'))
- def queryset(self, request):
+ def get_queryset(self, request):
return ONOSApp.get_tenant_objects_by_user(request.user)
admin.site.register(ONOSService, ONOSServiceAdmin)
diff --git a/xos/services/openvpn/admin.py b/xos/services/openvpn/admin.py
index b125c7b..ddfe510 100644
--- a/xos/services/openvpn/admin.py
+++ b/xos/services/openvpn/admin.py
@@ -93,7 +93,7 @@
suit_form_tabs = (('general', 'VPN Service Details'),
('slices', 'Slices'),)
- def queryset(self, request):
+ def get_queryset(self, request):
return OpenVPNService.get_service_objects_by_user(request.user)
@@ -222,7 +222,7 @@
suit_form_tabs = (('general', 'Details'),
('tenantprivileges', 'Privileges'))
- def queryset(self, request):
+ def get_queryset(self, request):
return OpenVPNTenant.get_tenant_objects_by_user(request.user)
diff --git a/xos/services/vrouter/admin.py b/xos/services/vrouter/admin.py
index 5d179f7..d72148e 100644
--- a/xos/services/vrouter/admin.py
+++ b/xos/services/vrouter/admin.py
@@ -57,7 +57,7 @@
suit_form_includes = (('vrouteradmin.html', 'top', 'administration'),
) #('hpctools.html', 'top', 'tools') )
- def queryset(self, request):
+ def get_queryset(self, request):
return VRouterService.get_service_objects_by_user(request.user)
class VRouterTenantForm(forms.ModelForm):
@@ -107,7 +107,7 @@
suit_form_tabs = (('general','Details'),)
- def queryset(self, request):
+ def get_queryset(self, request):
return VRouterTenant.get_tenant_objects_by_user(request.user)
admin.site.register(VRouterService, VRouterServiceAdmin)
diff --git a/xos/services/vtn/admin.py b/xos/services/vtn/admin.py
index 026cc08..bf829c3 100644
--- a/xos/services/vtn/admin.py
+++ b/xos/services/vtn/admin.py
@@ -89,7 +89,7 @@
suit_form_includes = ( # ('vtnadmin.html', 'top', 'administration'),
) #('hpctools.html', 'top', 'tools') )
- def queryset(self, request):
+ def get_queryset(self, request):
return VTNService.get_service_objects_by_user(request.user)
admin.site.register(VTNService, VTNServiceAdmin)
diff --git a/xos/services/vtr/admin.py b/xos/services/vtr/admin.py
index 9b288a5..96074a7 100644
--- a/xos/services/vtr/admin.py
+++ b/xos/services/vtr/admin.py
@@ -44,7 +44,7 @@
suit_form_includes = (('vtradmin.html', 'top', 'administration'),
) #('hpctools.html', 'top', 'tools') )
- def queryset(self, request):
+ def get_queryset(self, request):
return VTRService.get_service_objects_by_user(request.user)
class VTRTenantForm(forms.ModelForm):
@@ -104,7 +104,7 @@
def is_synced(self, obj):
return (obj.enacted is not None) and (obj.enacted >= obj.updated)
- def queryset(self, request):
+ def get_queryset(self, request):
return VTRTenant.get_tenant_objects_by_user(request.user)
admin.site.register(VTRService, VTRServiceAdmin)