git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f6f70ea
)
display sliver.instance_id in the right places
author
Scott Baker
<smbaker@gmail.com>
Mon, 19 Jan 2015 19:32:20 +0000
(11:32 -0800)
committer
Scott Baker
<smbaker@gmail.com>
Mon, 19 Jan 2015 19:32:20 +0000
(11:32 -0800)
planetstack/core/admin.py
patch
|
blob
|
history
diff --git
a/planetstack/core/admin.py
b/planetstack/core/admin.py
index
6c80c31
..
436543d
100644
(file)
--- a/
planetstack/core/admin.py
+++ b/
planetstack/core/admin.py
@@
-340,9
+340,9
@@
class NetworkLookerUpper:
class SliverInline(PlStackTabularInline):
model = Sliver
class SliverInline(PlStackTabularInline):
model = Sliver
- fields = ['backend_status_icon', 'all_ips_string', 'instance_name', 'slice', 'deployment', 'flavor', 'image', 'node']
+ fields = ['backend_status_icon', 'all_ips_string', 'instance_
id', 'instance_
name', 'slice', 'deployment', 'flavor', 'image', 'node']
extra = 0
extra = 0
- readonly_fields = ['backend_status_icon', 'all_ips_string', 'instance_name']
+ readonly_fields = ['backend_status_icon', 'all_ips_string', 'instance_
id', 'instance_
name']
suit_classes = 'suit-tab suit-tab-slivers'
def queryset(self, request):
suit_classes = 'suit-tab suit-tab-slivers'
def queryset(self, request):
@@
-1088,6
+1088,7
@@
class SliverForm(forms.ModelForm):
widgets = {
'ip': PlainTextWidget(),
'instance_name': PlainTextWidget(),
widgets = {
'ip': PlainTextWidget(),
'instance_name': PlainTextWidget(),
+ 'instance_id': PlainTextWidget(),
'slice': LinkedSelect,
'deployment': LinkedSelect,
'node': LinkedSelect,
'slice': LinkedSelect,
'deployment': LinkedSelect,
'node': LinkedSelect,
@@
-1103,10
+1104,10
@@
class TagAdmin(PlanetStackBaseAdmin):
class SliverAdmin(PlanetStackBaseAdmin):
form = SliverForm
fieldsets = [
class SliverAdmin(PlanetStackBaseAdmin):
form = SliverForm
fieldsets = [
- ('Sliver Details', {'fields': ['backend_status_text', 'slice', 'deployment', 'node', 'ip', 'instance_name', 'flavor', 'image', ], 'classes': ['suit-tab suit-tab-general'], })
+ ('Sliver Details', {'fields': ['backend_status_text', 'slice', 'deployment', 'node', 'ip', 'instance_
id', 'instance_
name', 'flavor', 'image', ], 'classes': ['suit-tab suit-tab-general'], })
]
readonly_fields = ('backend_status_text', )
]
readonly_fields = ('backend_status_text', )
- list_display = ['backend_status_icon', 'ip', 'instance_name', 'slice', 'flavor', 'image', 'node', 'deployment']
+ list_display = ['backend_status_icon', 'ip', 'instance_
id', 'instance_
name', 'slice', 'flavor', 'image', 'node', 'deployment']
list_display_links = ('backend_status_icon', 'ip',)
suit_form_tabs =(('general', 'Sliver Details'),)
list_display_links = ('backend_status_icon', 'ip',)
suit_form_tabs =(('general', 'Sliver Details'),)