Skip to content

Commit 0d13ce9

Browse files
authored
Merge pull request #1 from networktocode-llc/v.0.1.0
v. 0.1.0-beta release
2 parents 5c55a5e + bb1f2c6 commit 0d13ce9

38 files changed

+1315
-1653
lines changed

lb_models/api/nested_serializers.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,53 +7,53 @@
77
from lb_models import models
88

99

10-
class VIPHealthMonitorNestedSerializer(WritableNestedSerializer):
10+
class HealthMonitorNestedSerializer(WritableNestedSerializer):
1111
"""Health Monitor Nested Serializer."""
1212

1313
monitor = serializers.CharField(source="name")
1414

1515
class Meta:
1616
"""Meta attributes."""
1717

18-
model = models.VIPHealthMonitor
18+
model = models.HealthMonitor
1919
fields = ["monitor"]
2020

2121

22-
class VIPPoolMemberNestedSerializer(WritableNestedSerializer):
23-
"""VIP Pool Member Nested Serializer."""
22+
class ServiceGroupBindingNestedSerializer(WritableNestedSerializer):
23+
"""Service Group Member Nested Serializer."""
2424

2525
member = serializers.CharField(source="name")
26-
monitor = VIPHealthMonitorNestedSerializer()
26+
monitor = HealthMonitorNestedSerializer()
2727
address = ipam_nested_serializers.NestedIPAddressSerializer()
2828

2929
class Meta:
3030
"""Meta attributes."""
3131

32-
model = models.VIPPoolMember
32+
model = models.ServiceGroupBinding
3333
fields = ["member", "monitor", "address"]
3434

3535

36-
class VIPPoolNestedSerializer(WritableNestedSerializer):
37-
"""VIP Pool Nested Serializer."""
36+
class ServiceGroupNestedSerializer(WritableNestedSerializer):
37+
"""Service Group Nested Serializer."""
3838

3939
pool = serializers.CharField(source="name")
40-
member = VIPPoolMemberNestedSerializer()
41-
monitor = VIPHealthMonitorNestedSerializer()
40+
member = ServiceGroupBindingNestedSerializer()
41+
monitor = HealthMonitorNestedSerializer()
4242

4343
class Meta:
4444
"""Meta attributes."""
4545

46-
model = models.VIPPool
46+
model = models.ServiceGroup
4747
fields = ["pool", "member", "monitor"]
4848

4949

50-
class VIPCertificateNestedSerializer(WritableNestedSerializer):
51-
"""VIP Certificate Nested Serializer."""
50+
class CertificateNestedSerializer(WritableNestedSerializer):
51+
"""Certificate Nested Serializer."""
5252

53-
certificate = serializers.CharField(source="serial_number")
53+
certificate = serializers.CharField(source="name")
5454

5555
class Meta:
5656
"""Meta attributes."""
5757

58-
model = models.VIPCertificate
58+
model = models.Certificate
5959
fields = ["certificate"]

lb_models/api/serializers.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,65 +9,65 @@
99
from nautobot.ipam.api import nested_serializers as ipam_nested_serializers
1010

1111

12-
class VIPCertificateSerializer(ValidatedModelSerializer):
13-
"""VIP Certificate Serializer."""
12+
class CertificateSerializer(ValidatedModelSerializer):
13+
"""Certificate Serializer."""
1414

1515
class Meta:
1616
"""Meta attributes."""
1717

18-
model = models.VIPCertificate
18+
model = models.Certificate
1919
fields = "__all__"
2020

2121

22-
class VIPHealthMonitorSerializer(ValidatedModelSerializer):
23-
"""VIP Health Monitor Serializer."""
22+
class HealthMonitorSerializer(ValidatedModelSerializer):
23+
"""Health Monitor Serializer."""
2424

2525
class Meta:
2626
"""Meta attributes."""
2727

28-
model = models.VIPHealthMonitor
28+
model = models.HealthMonitor
2929
fields = "__all__"
3030

3131

32-
class VIPPoolMemberSerializer(ValidatedModelSerializer):
33-
"""VIP Pool Member Serializer."""
32+
class ServiceGroupBindingSerializer(ValidatedModelSerializer):
33+
"""Service Group Member Serializer."""
3434

3535
address = ipam_nested_serializers.NestedIPAddressSerializer()
36-
monitor = nested_serializers.VIPHealthMonitorNestedSerializer()
36+
monitor = nested_serializers.HealthMonitorNestedSerializer()
3737

3838
class Meta:
3939
"""Meta attributes."""
4040

41-
model = models.VIPPoolMember
41+
model = models.ServiceGroupBinding
4242
fields = "__all__"
4343

4444

45-
class VIPPoolSerializer(ValidatedModelSerializer):
46-
"""VIP Pool Serializer."""
45+
class ServiceGroupSerializer(ValidatedModelSerializer):
46+
"""Service Group Serializer."""
4747

48-
member = nested_serializers.VIPPoolMemberNestedSerializer()
49-
monitor = nested_serializers.VIPHealthMonitorNestedSerializer()
48+
member = nested_serializers.ServiceGroupBindingNestedSerializer()
49+
monitor = nested_serializers.HealthMonitorNestedSerializer()
5050

5151
class Meta:
5252
"""Meta attributes."""
5353

54-
model = models.VIPPool
54+
model = models.ServiceGroup
5555
fields = "__all__"
5656

5757

58-
class VIPSerializer(ValidatedModelSerializer):
59-
"""VIP Serializer."""
58+
class vserverSerializer(ValidatedModelSerializer):
59+
"""vserver Serializer."""
6060

6161
device = dcim_nested_serializers.NestedDeviceSerializer()
6262
interface = dcim_nested_serializers.NestedInterfaceSerializer()
6363
address = ipam_nested_serializers.NestedIPAddressSerializer()
64-
pool = nested_serializers.VIPPoolNestedSerializer()
64+
pool = nested_serializers.ServiceGroupNestedSerializer()
6565
vlan = ipam_nested_serializers.NestedVLANSerializer()
6666
vrf = ipam_nested_serializers.NestedVRFSerializer()
67-
certificate = nested_serializers.VIPCertificateNestedSerializer()
67+
certificate = nested_serializers.CertificateNestedSerializer()
6868

6969
class Meta:
7070
"""Meta attributes."""
7171

72-
model = models.VIP
72+
model = models.Vserver
7373
fields = "__all__"

lb_models/api/urls.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
from lb_models.api import views
66

77
router = OrderedDefaultRouter()
8-
router.register("vipcertificate", views.VIPCertificateViewSet)
9-
router.register("viphealthmonitor", views.VIPHealthMonitorViewSet)
10-
router.register("vippoolmember", views.VIPPoolMemberViewSet)
11-
router.register("vippool", views.VIPPoolViewSet)
12-
router.register("vip", views.VIPViewSet)
8+
router.register("certificate", views.CertificateViewSet)
9+
router.register("healthmonitor", views.HealthMonitorViewSet)
10+
router.register("servicegroupbinding", views.ServiceGroupBindingViewSet)
11+
router.register("servicegroup", views.ServiceGroupViewSet)
12+
router.register("vserver", views.vserverViewSet)
1313

1414

1515
app_name = "lb_models-api"

lb_models/api/views.py

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,41 @@
55
from lb_models.api import serializers
66

77

8-
class VIPCertificateViewSet(ModelViewSet): # pylint: disable=too-many-ancestors
9-
"""VIP Certificate serializer viewset."""
8+
class CertificateViewSet(ModelViewSet): # pylint: disable=too-many-ancestors
9+
"""Certificate serializer viewset."""
1010

11-
serializer_class = serializers.VIPCertificateSerializer
12-
filterset_class = filters.VIPCertificateFilterSet
13-
queryset = models.VIPCertificate.objects.all()
11+
serializer_class = serializers.CertificateSerializer
12+
filterset_class = filters.CertificateFilterSet
13+
queryset = models.Certificate.objects.all()
1414

1515

16-
class VIPHealthMonitorViewSet(ModelViewSet): # pylint: disable=too-many-ancestors
17-
"""VIP Health Monitor serializer viewset."""
16+
class HealthMonitorViewSet(ModelViewSet): # pylint: disable=too-many-ancestors
17+
"""Health Monitor serializer viewset."""
1818

19-
serializer_class = serializers.VIPHealthMonitorSerializer
20-
filterset_class = filters.VIPHealthMonitorFilterSet
21-
queryset = models.VIPHealthMonitor.objects.all()
19+
serializer_class = serializers.HealthMonitorSerializer
20+
filterset_class = filters.HealthMonitorFilterSet
21+
queryset = models.HealthMonitor.objects.all()
2222

2323

24-
class VIPPoolMemberViewSet(ModelViewSet): # pylint: disable=too-many-ancestors
25-
"""VIP Pool Member viewset."""
24+
class ServiceGroupBindingViewSet(ModelViewSet): # pylint: disable=too-many-ancestors
25+
"""Service Group Member viewset."""
2626

27-
serializer_class = serializers.VIPPoolMemberSerializer
28-
filterset_class = filters.VIPPoolMemberFilterSet
29-
queryset = models.VIPPoolMember.objects.all()
27+
serializer_class = serializers.ServiceGroupBindingSerializer
28+
filterset_class = filters.ServiceGroupBindingFilterSet
29+
queryset = models.ServiceGroupBinding.objects.all()
3030

3131

32-
class VIPPoolViewSet(ModelViewSet): # pylint: disable=too-many-ancestors
33-
"""VIP Pool viewset."""
32+
class ServiceGroupViewSet(ModelViewSet): # pylint: disable=too-many-ancestors
33+
"""Service Group viewset."""
3434

35-
serializer_class = serializers.VIPPoolSerializer
36-
filterset_class = filters.VIPPoolFilterSet
37-
queryset = models.VIPPool.objects.all()
35+
serializer_class = serializers.ServiceGroupSerializer
36+
filterset_class = filters.ServiceGroupFilterSet
37+
queryset = models.ServiceGroup.objects.all()
3838

3939

40-
class VIPViewSet(ModelViewSet): # pylint: disable=too-many-ancestors
41-
"""VIP viewset."""
40+
class vserverViewSet(ModelViewSet): # pylint: disable=too-many-ancestors
41+
"""vserver viewset."""
4242

43-
serializer_class = serializers.VIPSerializer
44-
filterset_class = filters.VIPFilterSet
45-
queryset = models.VIP.objects.all()
43+
serializer_class = serializers.vserverSerializer
44+
filterset_class = filters.VserverFilterSet
45+
queryset = models.Vserver.objects.all()

lb_models/choices.py

Lines changed: 73 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,84 @@
22
from nautobot.utilities.choices import ChoiceSet
33

44

5-
class CertAlgorithmChoices(ChoiceSet):
6-
"""Valid choices of certificate signing algorithm."""
5+
class Protocols(ChoiceSet):
6+
"""Valid choices for protocols."""
7+
8+
TCP = "tcp"
9+
UDP = "udp"
10+
11+
CHOICES = ((TCP, "tcp"), (UDP, "udp"))
712

8-
SHA1 = "sha1"
9-
SHA224 = "sha224"
10-
SHA256 = "sha256"
11-
SHA384 = "sha384"
12-
SHA512 = "sha512"
13-
MD2 = "md2"
14-
MD5 = "md5"
13+
14+
class HealthMonitorTypes(ChoiceSet):
15+
"""Valid choices for HealthMonitor."""
16+
17+
PING = "PING"
18+
TCP = "TCP"
19+
HTTP = "HTTP"
20+
TCP_ECV = "TCP-ECV"
21+
HTTP_ECV = "HTTP-ECV"
22+
UDP_ECV = "UDP-ECV"
23+
LDAP = "LDAP"
1524

1625
CHOICES = (
17-
(SHA1, "sha1"),
18-
(SHA224, "sha224"),
19-
(SHA256, "sha256"),
20-
(SHA384, "sha384"),
21-
(SHA512, "sha512"),
22-
(MD2, "md2"),
23-
(MD5, "md5"),
26+
# (PING, "PING"),
27+
# (TCP, "TCP"),
28+
(HTTP, "HTTP"),
29+
# (TCP_ECV, "TCP-ECV"),
30+
# (HTTP_ECV, "HTTP-ECV"),
31+
# (UDP_ECV, "UDP-ECV"),
32+
# (LDAP, "LDAP"),
2433
)
2534

2635

27-
class Protocols(ChoiceSet):
28-
"""Valid choices for protocols."""
36+
class ServiceGroupTypes(ChoiceSet):
37+
"""Valid choices for ServiceGroup."""
2938

30-
TCP = "tcp"
31-
UDP = "udp"
39+
TCP = "TCP"
40+
UDP = "UDP"
41+
HTTP = "HTTP"
42+
SSL = "SSL"
43+
SSL_BRIDGE = "SSL-BRIDGE"
44+
SSL_TCP = "SSL-TCP"
45+
ANY = "ANY"
3246

33-
CHOICES = ((TCP, "tcp"), (UDP, "udp"))
47+
CHOICES = (
48+
(TCP, "TCP"),
49+
(UDP, "UDP"),
50+
(HTTP, "HTTP"),
51+
(SSL, "SSL"),
52+
(SSL_BRIDGE, "SSL-BRIDGE"),
53+
(SSL_TCP, "SSL_TCP"),
54+
(ANY, "ANY"),
55+
)
56+
57+
58+
class ApplicationClassTypes(ChoiceSet):
59+
"""Valid choices for ApplicationClassTypes."""
60+
61+
PRODUCTION = "Production"
62+
DEVELOPMENT = "Development"
63+
TEST = "Test"
64+
UAT = "UAT"
65+
NETLAB = "NetLab"
66+
67+
CHOICES = (
68+
(PRODUCTION, "Production"),
69+
(DEVELOPMENT, "Development"),
70+
(TEST, "Test"),
71+
(UAT, "UAT"),
72+
(NETLAB, "NetLab"),
73+
)
74+
75+
76+
class ApplicationAccessibility(ChoiceSet):
77+
"""Valid choices for ApplicationAccessibility."""
78+
79+
TR = "TR"
80+
NTR = "NTR"
81+
82+
CHOICES = (
83+
(TR, "TR"),
84+
(NTR, "NTR"),
85+
)

0 commit comments

Comments
 (0)