Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
DIARIO_MANAGER
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
DIARIO_MANAGER
Commits
04240166
Commit
04240166
authored
Feb 20, 2018
by
Marcos Antonio Moura Campos Junior
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Finalizado INFATEC MANAGER
parent
9a1aa47d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
72 additions
and
9 deletions
+72
-9
src/backend/core/admin.py
src/backend/core/admin.py
+10
-0
src/backend/core/migrations/0014_auto_20180220_2012.py
src/backend/core/migrations/0014_auto_20180220_2012.py
+49
-0
src/backend/core/models/cliente.py
src/backend/core/models/cliente.py
+5
-1
src/backend/core/models/configuracao.py
src/backend/core/models/configuracao.py
+4
-4
src/backend/core/tasks.py
src/backend/core/tasks.py
+4
-4
No files found.
src/backend/core/admin.py
View file @
04240166
import
digitalocean
from
django
import
forms
from
django.contrib
import
admin
from
django.conf
import
settings
...
...
@@ -14,10 +16,18 @@ from .models import Sistema
class
ClienteForm
(
forms
.
ModelForm
):
droplets_size
=
forms
.
ChoiceField
()
class
Meta
:
model
=
Cliente
fields
=
"__all__"
def
__init__
(
self
,
*
args
,
**
kwargs
):
super
(
ClienteForm
,
self
)
.
__init__
(
*
args
,
**
kwargs
)
manager
=
digitalocean
.
Manager
(
token
=
Configuracao
.
get_solo
()
.
token
)
self
.
fields
[
'droplets_size'
]
.
choices
=
[(
val
,
val
)
for
val
in
manager
.
get_all_sizes
()]
def
clean_subdomain_name
(
self
):
data
=
self
.
cleaned_data
[
'subdomain_name'
]
self
.
username_subdomain_name_clean
(
data
)
...
...
src/backend/core/migrations/0014_auto_20180220_2012.py
0 → 100644
View file @
04240166
# Generated by Django 2.0.1 on 2018-02-20 20:12
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'core'
,
'0013_auto_20180220_1910'
),
]
operations
=
[
migrations
.
RemoveField
(
model_name
=
'configuracao'
,
name
=
'droplets_backups'
,
),
migrations
.
RemoveField
(
model_name
=
'configuracao'
,
name
=
'droplets_image'
,
),
migrations
.
RemoveField
(
model_name
=
'configuracao'
,
name
=
'droplets_ipv6'
,
),
migrations
.
RemoveField
(
model_name
=
'configuracao'
,
name
=
'droplets_size'
,
),
migrations
.
AddField
(
model_name
=
'cliente'
,
name
=
'droplets_backups'
,
field
=
models
.
BooleanField
(
default
=
False
),
),
migrations
.
AddField
(
model_name
=
'cliente'
,
name
=
'droplets_image'
,
field
=
models
.
CharField
(
default
=
'ubuntu-16-04-x64'
,
max_length
=
50
,
verbose_name
=
'Imagem/SO dos Droplets'
),
),
migrations
.
AddField
(
model_name
=
'cliente'
,
name
=
'droplets_ipv6'
,
field
=
models
.
BooleanField
(
default
=
False
),
),
migrations
.
AddField
(
model_name
=
'cliente'
,
name
=
'droplets_size'
,
field
=
models
.
CharField
(
default
=
's-1vcpu-1gb'
,
max_length
=
50
,
verbose_name
=
'Tamanho dos Droplets'
),
),
]
src/backend/core/models/cliente.py
View file @
04240166
...
...
@@ -9,7 +9,6 @@ import django_rq
class
Cliente
(
models
.
Model
):
"""Model definition for Cliente."""
# Informações do cliente
nome
=
models
.
CharField
(
max_length
=
50
)
subdomain_name
=
models
.
CharField
(
_
(
'Subdomínio'
),
max_length
=
50
,
unique
=
True
)
...
...
@@ -17,12 +16,17 @@ class Cliente(models.Model):
username
=
models
.
CharField
(
max_length
=
50
)
password
=
models
.
CharField
(
max_length
=
50
)
sistema
=
models
.
ForeignKey
(
'Sistema'
,
models
.
PROTECT
,
related_name
=
'clientes'
)
# Informações do droplet
droplet_id
=
models
.
CharField
(
_
(
'ID do droplet'
),
max_length
=
50
,
blank
=
True
,
null
=
True
)
droplet_ip
=
models
.
CharField
(
_
(
'IP do droplet'
),
max_length
=
50
,
blank
=
True
,
null
=
True
)
droplet_status
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
null
=
True
)
droplet_logs
=
models
.
TextField
(
blank
=
True
,
default
=
''
)
droplets_image
=
models
.
CharField
(
_
(
'Imagem/SO dos Droplets'
),
max_length
=
50
,
default
=
"ubuntu-16-04-x64"
)
droplets_size
=
models
.
CharField
(
_
(
'Tamanho dos Droplets'
),
max_length
=
50
,
default
=
"512mb"
)
droplets_backups
=
models
.
BooleanField
(
default
=
False
)
droplets_ipv6
=
models
.
BooleanField
(
default
=
False
)
class
Meta
:
"""Meta definition for Cliente."""
...
...
src/backend/core/models/configuracao.py
View file @
04240166
...
...
@@ -11,10 +11,10 @@ class Configuracao(SingletonModel):
token
=
models
.
CharField
(
max_length
=
255
)
droplets_region
=
models
.
CharField
(
_
(
'Região dos Droplets'
),
max_length
=
50
,
default
=
"nyc1"
)
droplets_image
=
models
.
CharField
(
_
(
'Imagem/SO dos Droplets'
),
max_length
=
50
,
default
=
"ubuntu-16-04-x64"
)
droplets_size
=
models
.
CharField
(
_
(
'Tamanho dos Droplets'
),
max_length
=
50
,
default
=
"s-1vcpu-1gb"
)
droplets_backups
=
models
.
BooleanField
(
default
=
False
)
droplets_ipv6
=
models
.
BooleanField
(
default
=
False
)
#
droplets_image = models.CharField(_('Imagem/SO dos Droplets'), max_length=50, default="ubuntu-16-04-x64")
#
droplets_size = models.CharField(_('Tamanho dos Droplets'), max_length=50, default="s-1vcpu-1gb")
#
droplets_backups = models.BooleanField(default=False)
#
droplets_ipv6 = models.BooleanField(default=False)
#droplets_user_data = models.TextField(blank=True) movido para o model de Sistema
def
__str__
(
self
):
...
...
src/backend/core/tasks.py
View file @
04240166
...
...
@@ -34,10 +34,10 @@ def criar_droplet(cliente):
cliente
.
username
,
cliente
.
subdomain_name
)
.
replace
(
'_'
,
'-'
),
region
=
configuracoes
.
droplets_region
,
image
=
c
onfiguracoes
.
droplets_image
,
size_slug
=
c
onfiguracoes
.
droplets_size
,
backups
=
c
onfiguracoes
.
droplets_backups
,
ipv6
=
c
onfiguracoes
.
droplets_ipv6
,
image
=
c
liente
.
droplets_image
,
size_slug
=
c
liente
.
droplets_size
,
backups
=
c
liente
.
droplets_backups
,
ipv6
=
c
liente
.
droplets_ipv6
,
user_data
=
cliente
.
user_data
,
ssh_keys
=
configuracoes
.
ssh_keys
)
...
...
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