/ - Diff - Synnefo - Greek Research and Technology Network's projects

     class Subnet(models.Model):
         SUBNET_NAME_LENGTH = 128
         subnet_id = models.CharField('ID of the subnet', max_length=128,
                                      null=True, db_index=True, primary_key=True)
         network = models.ForeignKey('Network')
         name = models.CharField('Network Name', max_length=128)
         name = models.CharField('Network Name', max_length=SUBNET_NAME_LENGTH)
         ipversion = models.IntegerField('IP Version', default=4)
         cidr = models.CharField('Subnet', max_length=32, null=True)
         gateway = models.CharField('Gateway', max_length=32, null=True)

     import ipaddr
     log = getLogger('synnefo.neutron')
     log = getLogger(__name__)
     def demux(request):
         if request.method == 'GET':
             return list_subnets(request)
         elif request.method == 'POST':
             #return create_network(request)
             return HttpResponse("in subnet POST")
             return create_subnet(request)
         else:
             return api.api_method_not_allowed(request)
-...
         if request.method == 'GET':
             return get_subnet(request, offset)
         elif request.method == 'DELETE':
             return delete_network(request, offset)
             return delete_subnet(request, offset)
         elif request.method == 'PUT':
             #return update_network(request,offset)
             return HttpResponse("in subnet det put")
             return update_subnet(request, offset)
         else:
             return api.api_method_not_allowed(request)
-...
     @api.api_method(http_method='POST', user_required=True, logger=log)
     def create_subnet(request):
         '''Create a subnet'''
         dic = utils.get_request_dict(request)
         log.info('create subnet %s', dic)
         user_id = request.user_uniq
         try:
             dic = utils.get_request_dict(request)
             subnet = dic['subnet']
             network_id = subnet['network_id']
             cidr = subnet['cidr']
-...
         ipversion = subnet.get('ip_version', 4)
         if ipversion not in [4, 6]:
             raise api.faults.BadRequests("Malformed IP version type")
             raise api.faults.BadRequest("Malformed IP version type")
         dhcp = subnet.get('enable_dhcp', True)
         if dhcp not in [True, False]:
             raise api.faults.BadRequest("Malformed request, enable_dhcp must be"
                                         " True or False")
         name = subnet.get('name', None)
         if len(str(name)) > Subnet.SUBNET_NAME_LENGTH:
             raise api.faults.BadRequest("Subnet name too long")
         # FIX ME, SNF:gateway6 vs gateway6
         gateway6 = subnet.get('SNF:gateway6', None)
         subnet6 = subnet.get('SNF:subnet6', None)
         # Returns the first available ip in the subnet
         # Returns the first available IP in the subnet
         potential_gateway = ipaddr.IPv4Network(cidr).network + 1
         gateway = subnet.get('gateway_ip', potential_gateway)
         networks.validate_network_params(subnet, gateway, subnet6, gateway6)
         networks.validate_network_params(cidr, gateway, subnet6, gateway6)
         # FIX ME
         try:
             sub = Subnet.objects.create(name=name, network_id=network_id,
                                         cidr=cidr, ipversion=ipversion,
                                         gateway=gateway, gateway6=gateway6,
                                         subnet6=subnet6)
         # FIX ME
         except:
             print "Error"
-...
     @api.api_method(http_method='DELETE', user_required=True, logger=log)
     def delete_subnet(request, offset):
         '''Delete a subnet'''
         try:
             subnet = Subnet.objects.get(subnet_id=offset)
         except Subnet.DoesNotExist:
             raise api.faults.ItemNotFound("Subnet not found")
         # Commented until we have a design document
         #log.info('delete_subnet %s', offset)
         #try:
         #    subnet = Subnet.objects.get(subnet_id=offset)
         #except Subnet.DoesNotExist:
         #    raise api.faults.ItemNotFound("Subnet not found")
             # Add support for 409 error, subnet in use
         subnet.delete()
         return HttpResponse(status=204)
         #subnets.delete()
         #return HttpResponse(status=204)
         raise api.faults.BadRequest("Deletion of a subnet is not supported")
     def subnet_to_dict(subnet):

             response = self.get(url)
             self.assertItemNotFound(response)
         def test_subnet_delete_not_found(self):
             '''Test delete a subnet that doesn't exist'''
             url = join_urls(SUBNETS_URL, '52')
             response = self.get(url)
             self.assertItemNotFound(response)
         #def test_subnet_delete_not_found(self):
          #   '''Test delete a subnet that doesn't exist'''
          #   # FIX ME
          #   url = join_urls(SUBNETS_URL, '52')
          #   response = self.get(url)
          #   self.assertItemNotFound(response)
         def test_subnet_delete(self):
             '''Test delete a subnet that's not in use'''
             '''Test delete a subnet -- not supported'''
             url = join_urls(SUBNETS_URL, '42')
             response = self.get(url)
             self.assertItemNotFound(response)
         def test_create_subnet_with_malformed_ipversion(self):
             '''Create a subnet with a malformed ip_version type'''
             # PEP8 for {{}}?
             request = {'subnet': {'network_id':
                                   'ed2e3c10-2e43-4297-9006-2863a2d1abbc',
                                   'cidr': '10.0.3.0/24',
                                   'ip_version': 8}}
             request = {
                 'subnet': {
                     'network_id': 'ed2e3c10-2e43-4297-9006-2863a2d1abbc',
                     'cidr': '10.0.3.0/24',
                     'ip_version': 8}
+            }
             response = self.post(SUBNETS_URL, "user9", json.dumps(request), "json")
             self.assertBadRequest(response)
         def test_create_subnet_with_invalid_cidr(self):
             '''Create a subnet with an invalid cidr'''
             request = {
                 'subnet': {
                     'network_id': 'ed2e3c10-2e43-4297-9006-2863a2d1abbc',
                     'cidr': '192.168.3.0/8'}
+            }
             response = self.post(SUBNETS_URL, "user9", json.dumps(request), "json")
             self.assertBadRequest(response)
         def test_create_subnet_with_invalid_gateway(self):
             '''Create a subnet with a gateway outside of the subnet range'''
             request = {
                 'subnet': {
                     'network_id': 'ed2e3c10-2e43-4297-9006-2863a2d1abbc',
                     'cidr': '192.168.3.0/24',
                     'gateway_ip': '192.168.0.1'}
+            }
             response = self.post(SUBNETS_URL, "user9", json.dumps(request), "json")
             self.assertBadRequest(response)
         def test_create_subnet_with_long_name(self):
             '''Create a subnet with an invalid subnet name'''
             request = {
                 'subnet': {
                     'network_id': 'ed2e3c10-2e43-4297-9006-2863a2d1abbc',
                     'cidr': '192.168.3.0/24',
                     'name': 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
                             'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
                             'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'}
+            }
             response = self.post(SUBNETS_URL, "user9", json.dumps(request), "json")
             self.assertBadRequest(response)
         def test_create_subnet_with_invalid_dhcp(self):
             '''Create a subnet with an invalid dhcp value'''
             request = {
                 'subnet': {
                     'network_id': 'ed2e3c10-2e43-4297-9006-2863a2d1abbc',
                     'cidr': '192.168.3.0/24',
                     'enable_dhcp': 'None'}
+            }
             response = self.post(SUBNETS_URL, "user9", json.dumps(request), "json")
             self.assertBadRequest(response)

Synnefo

Revision 882b662f