ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Merge branch 'develop' into hosting_i18n

Browse source
This commit is contained in:
modulos 2017-06-01 18:34:42 +02:00
commit 88393c3da7
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
opennebula_api/serializers.py
View file

@ -79,7 +79,7 @@ class VirtualMachineTemplateSerializer(serializers.Serializer):
class VirtualMachineSerializer(serializers.Serializer): class VirtualMachineSerializer(serializers.Serializer):
"""Serializer to map the virtual machine instance into JSON format.""" """Serializer to map the virtual machine instance into JSON format."""
name = serializers.CharField(read_only=True) name = serializers.SerializerMethodField()
cores = serializers.IntegerField(source='template.vcpu') cores = serializers.IntegerField(source='template.vcpu')
disk = serializers.IntegerField(write_only=True) disk = serializers.IntegerField(write_only=True)
set_memory = serializers.IntegerField(write_only=True, label='Memory') set_memory = serializers.IntegerField(write_only=True, label='Memory')
@ -164,6 +164,8 @@ class VirtualMachineSerializer(serializers.Serializer):
nic = obj.template.nics[0] nic = obj.template.nics[0]
return nic.ip6_global return nic.ip6_global
def get_name(self, obj):
return obj.name.strip('public-')
def hexstr2int(string): def hexstr2int(string):
return int(string.replace(':', ''), 16) return int(string.replace(':', ''), 16)

9
opennebula_api/tests.py
View file

@ -113,6 +113,15 @@ class VirtualMachineTestCase(TestCase):
self.virtualmachine = VirtualMachine(opennebula_id=self.opennebula_id, self.virtualmachine = VirtualMachine(opennebula_id=self.opennebula_id,
template=self.template) template=self.template)
def test_serializer_strips_of_public(self):
""" Test the serialized object contains no 'public-'."""
template = self.manager.get_templates().first()
serialized = VirtualMachineTemplateSerializer(template)
self.assertEqual(serialized.data.name, template.name.strip('public-'))
def test_model_can_create_a_virtualmachine(self): def test_model_can_create_a_virtualmachine(self):
"""Test the virtualmachine model can create a virtualmachine.""" """Test the virtualmachine model can create a virtualmachine."""