Skip to content

Commit

Permalink
Adding FailOverRouter supports to MT / MO Router
Browse files Browse the repository at this point in the history
  • Loading branch information
@101t
101t committed Nov 10, 2021
1 parent 94265c5 commit 2965a00
Show file tree
Hide file tree
Showing 6 changed files with 473 additions and 408 deletions.
5 changes: 4 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,10 @@ What's new in version 2.0.0
What's new in version 2.0.1
1. Adding **Submit Log** report (DLR report)

**TODO:** bug fixes, adding new feature
What's new in version 2.0.2
1. Adding FailOverRouter supports to MT / MO Router

**TODO:** bug fixes, adding new features

## Usage

Expand Down
195 changes: 114 additions & 81 deletions main/core/models/smpp.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,97 +8,130 @@
from .timestamped import TimeStampedModel

filter_types = (
('TransparentFilter', 'TransparentFilter',),
('ConnectorFilter', 'ConnectorFilter',),
('UserFilter', 'UserFilter',),
('GroupFilter', 'GroupFilter',),
('SourceAddrFilter', 'SourceAddrFilter',),
('DestinationAddrFilter', 'DestinationAddrFilter',),
('ShortMessageFilter', 'ShortMessageFilter',),
('DateIntervalFilter', 'DateIntervalFilter',),
('TimeIntervalFilter', 'TimeIntervalFilter',),
('TagFilter', 'TagFilter',),
('EvalPyFilter', 'EvalPyFilter',),
('TransparentFilter', 'TransparentFilter',),
('ConnectorFilter', 'ConnectorFilter',),
('UserFilter', 'UserFilter',),
('GroupFilter', 'GroupFilter',),
('SourceAddrFilter', 'SourceAddrFilter',),
('DestinationAddrFilter', 'DestinationAddrFilter',),
('ShortMessageFilter', 'ShortMessageFilter',),
('DateIntervalFilter', 'DateIntervalFilter',),
('TimeIntervalFilter', 'TimeIntervalFilter',),
('TagFilter', 'TagFilter',),
('EvalPyFilter', 'EvalPyFilter',),
)


class FiltersModel(TimeStampedModel):
class Meta:
db_table = "tbl_filters"
verbose_name='Filters'
verbose_name_plural = verbose_name
type = models.CharField(u'Type', choices=filter_types, max_length=24)
fid = models.CharField(u'Filter ID', max_length=24, unique=True)
parameters = models.TextField(u'Parameters')
def __str__(self):
return self.fid
class Meta:
db_table = "tbl_filters"
verbose_name = 'Filters'
verbose_name_plural = verbose_name

type = models.CharField('Type', choices=filter_types, max_length=24)
fid = models.CharField('Filter ID', max_length=24, unique=True)
parameters = models.TextField('Parameters')

def __str__(self):
return self.fid


class GroupsModel(TimeStampedModel):
class Meta:
db_table = "tbl_groups"
verbose_name='Groups'
verbose_name_plural = verbose_name
gid = models.CharField(u'Group ID', max_length=24, unique=True)
status = models.BooleanField(u'Status', default=True)
def __str__(self):
return self.gid
class Meta:
db_table = "tbl_groups"
verbose_name = 'Groups'
verbose_name_plural = verbose_name

gid = models.CharField('Group ID', max_length=24, unique=True)
status = models.BooleanField('Status', default=True)

def __str__(self):
return self.gid


class UsersModel(TimeStampedModel):
class Meta:
db_table = "tbl_users"
verbose_name='Users'
verbose_name_plural=verbose_name
uid = models.CharField(u'User ID', max_length=24, unique=True)
gid = models.ForeignKey(GroupsModel, on_delete=models.CASCADE, verbose_name=u'Group ID')
username = models.CharField(u'Username', max_length=24)
password = models.CharField(u'Password', max_length=24)
parameters = models.TextField(u'Parameters')
user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name=u"Related User")
def __str__(self):
return self.uid
class Meta:
db_table = "tbl_users"
verbose_name = 'Users'
verbose_name_plural = verbose_name

uid = models.CharField('User ID', max_length=24, unique=True)
gid = models.ForeignKey(GroupsModel, on_delete=models.CASCADE, verbose_name=u'Group ID')
username = models.CharField('Username', max_length=24)
password = models.CharField('Password', max_length=24)
parameters = models.TextField('Parameters')
user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name=u"Related User")

def __str__(self):
return self.uid


class HTTPccmModel(TimeStampedModel):
class Meta:
db_table = "tbl_httpccm"
verbose_name='HTTP Client Connector'
verbose_name_plural=verbose_name
cid = models.CharField(u'Connector ID', max_length=24, unique=True, help_text='Connector identifier')
url = models.CharField(u'URL', max_length=128, help_text='URL to be called with message parameters')
method = models.CharField(u'Method', max_length=16, choices=(("GET", "GET",), ("POST", "POST",),))
def __str__(self):
return self.cid
class Meta:
db_table = "tbl_httpccm"
verbose_name = 'HTTP Client Connector'
verbose_name_plural = verbose_name

cid = models.CharField('Connector ID', max_length=24, unique=True, help_text='Connector identifier')
url = models.CharField('URL', max_length=128, help_text='URL to be called with message parameters')
method = models.CharField('Method', max_length=16, choices=(("GET", "GET",), ("POST", "POST",),))

def __str__(self):
return self.cid


class SMPPccmModel(TimeStampedModel):
class Meta:
db_table = "tbl_smppccm"
verbose_name = "SMPP Client Connector"
verbose_name_plural=verbose_name
cid = models.CharField(u'Connector ID', max_length=24, unique=True, help_text='Connector identifier')
parameters = models.TextField(u'Parameters')
action = models.BooleanField(u"Action", default=True, help_text='Start/Stop SMPP Connector')
def __str__(self):
return self.cid

morouter_types = (("DefaultRoute", "DefaultRoute",), ("StaticMORoute", "StaticMORoute",), ("RandomRoundrobinMORoute", "RandomRoundrobinMORoute",),)
class Meta:
db_table = "tbl_smppccm"
verbose_name = "SMPP Client Connector"
verbose_name_plural = verbose_name

cid = models.CharField('Connector ID', max_length=24, unique=True, help_text='Connector identifier')
parameters = models.TextField('Parameters')
action = models.BooleanField(u"Action", default=True, help_text='Start/Stop SMPP Connector')

def __str__(self):
return self.cid


morouter_types = (
("DefaultRoute", "DefaultRoute",),
("StaticMORoute", "StaticMORoute",),
("RandomRoundrobinMORoute", "RandomRoundrobinMORoute",),
("FailoverMORoute", "FailoverMORoute",),
)


class MORoutersModel(TimeStampedModel):
class Meta:
db_table = "tbl_morouters"
verbose_name='MO Router'
verbose_name_plural=verbose_name
type = models.CharField(u'Type', choices=morouter_types, max_length=24)
order = models.CharField(u'Order', max_length=24, help_text='Router order, also used to identify router')
smppconnectors = models.ForeignKey(SMPPccmModel, on_delete=models.CASCADE, verbose_name=u'SMPP Connectors')
httpconnectors = models.ForeignKey(HTTPccmModel, on_delete=models.CASCADE, verbose_name=u'SMPP Connectors')
filters = models.ForeignKey(FiltersModel, on_delete=models.CASCADE, verbose_name=u'Filters')

mtrouter_types = (("DefaultRoute", "DefaultRoute",), ("StaticMTRoute", "StaticMTRoute",), ("RandomRoundrobinMTRoute", "RandomRoundrobinMTRoute",),)
class Meta:
db_table = "tbl_morouters"
verbose_name = 'MO Router'
verbose_name_plural = verbose_name

type = models.CharField('Type', choices=morouter_types, max_length=24)
order = models.CharField('Order', max_length=24, help_text='Router order, also used to identify router')
smppconnectors = models.ForeignKey(SMPPccmModel, on_delete=models.CASCADE, verbose_name=u'SMPP Connectors')
httpconnectors = models.ForeignKey(HTTPccmModel, on_delete=models.CASCADE, verbose_name=u'SMPP Connectors')
filters = models.ForeignKey(FiltersModel, on_delete=models.CASCADE, verbose_name=u'Filters')


mtrouter_types = (
("DefaultRoute", "DefaultRoute",),
("StaticMTRoute", "StaticMTRoute",),
("RandomRoundrobinMTRoute", "RandomRoundrobinMTRoute",),
("FailoverMTRoute", "FailoverMTRoute"),
)


class MTRoutersModel(TimeStampedModel):
class Meta:
db_table = "tbl_mtrouters"
verbose_name='MT Router'
verbose_name_plural=verbose_name
type = models.CharField(u'Type', choices=mtrouter_types, max_length=24)
order = models.CharField(u'Order', max_length=24, help_text='Router order, also used to identify router')
rate = models.FloatField(u'Rate', default=0.1)
smppconnectors = models.ForeignKey(SMPPccmModel, on_delete=models.CASCADE, verbose_name=u'SMPP Connectors')
httpconnectors = models.ForeignKey(HTTPccmModel, on_delete=models.CASCADE, verbose_name=u'SMPP Connectors')
filters = models.ForeignKey(FiltersModel, on_delete=models.CASCADE, verbose_name=u'Filters')
class Meta:
db_table = "tbl_mtrouters"
verbose_name = 'MT Router'
verbose_name_plural = verbose_name

type = models.CharField('Type', choices=mtrouter_types, max_length=24)
order = models.CharField('Order', max_length=24, help_text='Router order, also used to identify router')
rate = models.FloatField('Rate', default=0.1)
smppconnectors = models.ForeignKey(SMPPccmModel, on_delete=models.CASCADE, verbose_name=u'SMPP Connectors')
httpconnectors = models.ForeignKey(HTTPccmModel, on_delete=models.CASCADE, verbose_name=u'SMPP Connectors')
filters = models.ForeignKey(FiltersModel, on_delete=models.CASCADE, verbose_name=u'Filters')
Loading

0 comments on commit 2965a00

Please sign in to comment.