Skip to content

Commit

Permalink
Merge branch 'develop' into rack
Browse files Browse the repository at this point in the history
  • Loading branch information
laurapanzariello authored and laurapanzariello committed Oct 28, 2015
2 parents 9a281fa + b3d9073 commit 8dcd970
Show file tree
Hide file tree
Showing 7 changed files with 480 additions and 4 deletions.
67 changes: 67 additions & 0 deletions networkapiclient/ApiNetworkIPv4.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
from networkapiclient.ApiGenericClient import ApiGenericClient


class ApiNetworkIPv4(ApiGenericClient):

def __init__(self, networkapi_url, user, password, user_ldap=None):
"""Class constructor receives parameters to connect to the networkAPI.
:param networkapi_url: URL to access the network API.
:param user: User for authentication.
:param password: Password for authentication.
"""

super(ApiNetworkIPv4, self).__init__(
networkapi_url,
user,
password,
user_ldap
)

def deploy(self, id_networkv4):
"""Deploy network in equipments and set column 'active = 1' in tables redeipv4
:param id_networkv4: ID for NetworkIPv4
:return: Equipments configuration output
"""

data = dict()
uri = "api/networkv4/%s/equipments/" % id_networkv4
return self.post(uri, data=data)

def get_by_id(self, id_networkv4):
"""Get IPv4 network
:param id_networkv4: ID for NetworkIPv4
:return: IPv4 Network
"""

uri = "api/networkv4/%s/" % id_networkv4
return self.get(uri)

def list(self, environment_vip=None):
"""List IPv4 networks
:param environment_vip: environment vip to filter
:return: IPv4 Networks
"""

data = dict()
uri = "api/networkv4/?"
if environment_vip:
uri += "environment_vip=%s" % environment_vip

return self.get(uri)

def undeploy(self, id_networkv4):
"""Remove deployment of network in equipments and set column 'active = 0' in tables redeipv4 ]
:param id_networkv4: ID for NetworkIPv4
:return: Equipments configuration output
"""

uri = "api/networkv4/%s/equipments/" % id_networkv4
return self.delete(uri)
67 changes: 67 additions & 0 deletions networkapiclient/ApiNetworkIPv6.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
from networkapiclient.ApiGenericClient import ApiGenericClient


class ApiNetworkIPv6(ApiGenericClient):

def __init__(self, networkapi_url, user, password, user_ldap=None):
"""Class constructor receives parameters to connect to the networkAPI.
:param networkapi_url: URL to access the network API.
:param user: User for authentication.
:param password: Password for authentication.
"""

super(ApiNetworkIPv6, self).__init__(
networkapi_url,
user,
password,
user_ldap
)

def deploy(self, id_networkv6):
"""Deploy network in equipments and set column 'active = 1' in tables redeipv6 ]
:param id_networkv6: ID for NetworkIPv6
:return: Equipments configuration output
"""

data = dict()
uri = "api/networkv6/%s/equipments/" % id_networkv6
return self.post(uri, data=data)

def get_by_id(self, id_networkv6):
"""Get IPv6 network
:param id_networkv4: ID for NetworkIPv6
:return: IPv6 Network
"""

uri = "api/networkv4/%s/" % id_networkv6
return self.get(uri)

def list(self, environment_vip=None):
"""List networks redeipv6 ]
:param environment_vip: environment vip to filter
:return: IPv6 Networks
"""

data = dict()
uri = "api/networkv6/?"
if environment_vip:
uri += "environment_vip=%s" % environment_vip

return self.get(uri)

def undeploy(self, id_networkv6):
"""Remove deployment of network in equipments and set column 'active = 0' in tables redeipv6 ]
:param id_networkv6: ID for NetworkIPv6
:return: Equipments configuration output
"""

uri = "api/networkv6/%s/equipments/" % id_networkv6
return self.delete(uri)
49 changes: 47 additions & 2 deletions networkapiclient/ClientFactory.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
from networkapiclient.UsuarioGrupo import UsuarioGrupo
from networkapiclient.DireitoGrupoEquipamento import DireitoGrupoEquipamento
from networkapiclient.Network import Network
from networkapiclient.Network import DHCPRelayIPv4
from networkapiclient.Network import DHCPRelayIPv6
from networkapiclient.EnvironmentVIP import EnvironmentVIP
from networkapiclient.OptionVIP import OptionVIP
from networkapiclient.Filter import Filter
Expand All @@ -53,6 +55,8 @@
from networkapiclient.Healthcheck import Healthcheck
from networkapiclient.ApiVipRequest import ApiVipRequest
from networkapiclient.ApiInterface import ApiInterfaceRequest
from networkapiclient.ApiNetworkIPv4 import ApiNetworkIPv4
from networkapiclient.ApiNetworkIPv6 import ApiNetworkIPv6
from networkapiclient.Rack import Rack
from networkapiclient.RackServers import RackServers
from networkapiclient.System import System
Expand Down Expand Up @@ -290,6 +294,24 @@ def create_network(self):
self.password,
self.user_ldap)

def create_dhcprelay_ipv4(self):
"""Get an instance of DHCPRelayIPv4 services facade."""
return DHCPRelayIPv4(
self.networkapi_url,
self.user,
self.password,
self.user_ldap
)

def create_dhcprelay_ipv6(self):
"""Get an instance of DHCPRelayIPv6 services facade."""
return DHCPRelayIPv6(
self.networkapi_url,
self.user,
self.password,
self.user_ldap
)

def create_environment_vip(self):
"""Get an instance of environment_vip services facade."""
return EnvironmentVIP(
Expand Down Expand Up @@ -384,7 +406,30 @@ def create_api_interface_request(self):
self.networkapi_url,
self.user,
self.password,
self.user_ldap)
self.user_ldap
)

def create_api_network_ipv4(self):

"""Get an instance of Api Networkv4 services facade."""

return ApiNetworkIPv4(
self.networkapi_url,
self.user,
self.password,
self.user_ldap
)

def create_api_network_ipv6(self):

"""Get an instance of Api Networkv6 services facade."""

return ApiNetworkIPv6(
self.networkapi_url,
self.user,
self.password,
self.user_ldap
)

def create_rack(self):
"""Get an instance of rack services facade."""
Expand Down Expand Up @@ -425,4 +470,4 @@ def create_apirack(self):
self.networkapi_url,
self.user,
self.password,
self.user_ldap)
self.user_ldap)
Loading

0 comments on commit 8dcd970

Please sign in to comment.