Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
740256cf
authored
Mar 30, 2015
by
Bach Dániel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-django18warnings' into 'master'
Fix django18warnings
✅
See merge request !307
parents
55e743b2
8f8e50e0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
0 deletions
+24
-0
circle/dashboard/forms.py
+4
-0
circle/network/forms.py
+20
-0
No files found.
circle/dashboard/forms.py
View file @
740256cf
...
@@ -739,6 +739,7 @@ class LeaseForm(forms.ModelForm):
...
@@ -739,6 +739,7 @@ class LeaseForm(forms.ModelForm):
class
Meta
:
class
Meta
:
model
=
Lease
model
=
Lease
exclude
=
()
class
VmRenewForm
(
OperationForm
):
class
VmRenewForm
(
OperationForm
):
...
@@ -1604,6 +1605,7 @@ class DataStoreForm(ModelForm):
...
@@ -1604,6 +1605,7 @@ class DataStoreForm(ModelForm):
class
Meta
:
class
Meta
:
model
=
DataStore
model
=
DataStore
fields
=
(
"name"
,
"path"
,
"hostname"
,
)
class
DiskForm
(
ModelForm
):
class
DiskForm
(
ModelForm
):
...
@@ -1620,3 +1622,5 @@ class DiskForm(ModelForm):
...
@@ -1620,3 +1622,5 @@ class DiskForm(ModelForm):
class
Meta
:
class
Meta
:
model
=
Disk
model
=
Disk
fields
=
(
"name"
,
"filename"
,
"datastore"
,
"type"
,
"bus"
,
"size"
,
"base"
,
"dev_num"
,
"destroyed"
,
"is_ready"
,
)
circle/network/forms.py
View file @
740256cf
...
@@ -69,6 +69,8 @@ class BlacklistItemForm(ModelForm):
...
@@ -69,6 +69,8 @@ class BlacklistItemForm(ModelForm):
class
Meta
:
class
Meta
:
model
=
BlacklistItem
model
=
BlacklistItem
fields
=
(
"ipv4"
,
"host"
,
"expires_at"
,
"whitelisted"
,
"reason"
,
"snort_message"
,
)
class
DomainForm
(
ModelForm
):
class
DomainForm
(
ModelForm
):
...
@@ -90,6 +92,7 @@ class DomainForm(ModelForm):
...
@@ -90,6 +92,7 @@ class DomainForm(ModelForm):
class
Meta
:
class
Meta
:
model
=
Domain
model
=
Domain
fields
=
(
"name"
,
"ttl"
,
"owner"
,
)
class
FirewallForm
(
ModelForm
):
class
FirewallForm
(
ModelForm
):
...
@@ -105,6 +108,7 @@ class FirewallForm(ModelForm):
...
@@ -105,6 +108,7 @@ class FirewallForm(ModelForm):
class
Meta
:
class
Meta
:
model
=
Firewall
model
=
Firewall
fields
=
(
"name"
,
)
class
GroupForm
(
ModelForm
):
class
GroupForm
(
ModelForm
):
...
@@ -126,6 +130,7 @@ class GroupForm(ModelForm):
...
@@ -126,6 +130,7 @@ class GroupForm(ModelForm):
class
Meta
:
class
Meta
:
model
=
Group
model
=
Group
fields
=
(
"name"
,
"description"
,
"owner"
,
)
class
HostForm
(
ModelForm
):
class
HostForm
(
ModelForm
):
...
@@ -165,6 +170,9 @@ class HostForm(ModelForm):
...
@@ -165,6 +170,9 @@ class HostForm(ModelForm):
class
Meta
:
class
Meta
:
model
=
Host
model
=
Host
fields
=
(
"hostname"
,
"reverse"
,
"mac"
,
"vlan"
,
"shared_ip"
,
"ipv4"
,
"ipv6"
,
"external_ipv4"
,
"description"
,
"location"
,
"comment"
,
"owner"
,
)
class
RecordForm
(
ModelForm
):
class
RecordForm
(
ModelForm
):
...
@@ -191,6 +199,8 @@ class RecordForm(ModelForm):
...
@@ -191,6 +199,8 @@ class RecordForm(ModelForm):
class
Meta
:
class
Meta
:
model
=
Record
model
=
Record
fields
=
(
"type"
,
"host"
,
"name"
,
"domain"
,
"address"
,
"ttl"
,
"description"
,
"owner"
,
)
class
RuleForm
(
ModelForm
):
class
RuleForm
(
ModelForm
):
...
@@ -230,6 +240,10 @@ class RuleForm(ModelForm):
...
@@ -230,6 +240,10 @@ class RuleForm(ModelForm):
class
Meta
:
class
Meta
:
model
=
Rule
model
=
Rule
fields
=
(
"direction"
,
"description"
,
"foreign_network"
,
"dport"
,
"sport"
,
"weight"
,
"proto"
,
"extra"
,
"action"
,
"owner"
,
"nat"
,
"nat_external_port"
,
"nat_external_ipv4"
,
"vlan"
,
"vlangroup"
,
"host"
,
"hostgroup"
,
"firewall"
,
)
class
SwitchPortForm
(
ModelForm
):
class
SwitchPortForm
(
ModelForm
):
...
@@ -252,6 +266,7 @@ class SwitchPortForm(ModelForm):
...
@@ -252,6 +266,7 @@ class SwitchPortForm(ModelForm):
class
Meta
:
class
Meta
:
model
=
SwitchPort
model
=
SwitchPort
fields
=
(
"untagged_vlan"
,
"tagged_vlans"
,
"description"
,
)
class
VlanForm
(
ModelForm
):
class
VlanForm
(
ModelForm
):
...
@@ -305,6 +320,10 @@ class VlanForm(ModelForm):
...
@@ -305,6 +320,10 @@ class VlanForm(ModelForm):
widgets
=
{
widgets
=
{
'ipv6_template'
:
widgets
.
TextInput
,
'ipv6_template'
:
widgets
.
TextInput
,
}
}
fields
=
(
"name"
,
"vid"
,
"network_type"
,
"managed"
,
"network4"
,
"snat_to"
,
"snat_ip"
,
"dhcp_pool"
,
"network6"
,
"ipv6_template"
,
"host_ipv6_prefixlen"
,
"domain"
,
"reverse_domain"
,
"description"
,
"comment"
,
"owner"
,
)
class
VlanGroupForm
(
ModelForm
):
class
VlanGroupForm
(
ModelForm
):
...
@@ -328,3 +347,4 @@ class VlanGroupForm(ModelForm):
...
@@ -328,3 +347,4 @@ class VlanGroupForm(ModelForm):
class
Meta
:
class
Meta
:
model
=
VlanGroup
model
=
VlanGroup
fields
=
(
"name"
,
"vlans"
,
"description"
,
"owner"
,
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment