Merge branch 'tkt_white_3703_hostnames_pullRequest' into white/integr…

…acion
infobyte · Feb 21, 2017 · c33615b · c33615b
2 parents ed43dc8 + 485d207
commit c33615b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/model/controller.py b/model/controller.py
@@ -823,7 +823,7 @@ def newInterface(self, name, mac="00:00:00:00:00:00",
             ipv6_address=ipv6_address, ipv6_prefix=ipv6_prefix,
             ipv6_gateway=ipv6_gateway, ipv6_dns=ipv6_dns,
             network_segment=network_segment,
-            hostname_resolution=hostname_resolution, parent_id=parent_id)
+            hostnames=hostname_resolution, parent_id=parent_id)
 
     def newService(self, name, protocol="tcp?", ports=[], status="running",
                    version="unknown", description="", parent_id=None):

diff --git a/plugins/plugin.py b/plugins/plugin.py
@@ -167,7 +167,7 @@ def createAndAddInterface(
             ipv6_address=ipv6_address, ipv6_prefix=ipv6_prefix,
             ipv6_gateway=ipv6_gateway, ipv6_dns=ipv6_dns,
             network_segment=network_segment,
-            hostname_resolution=hostname_resolution, parent_id=host_id)
+            hostnames=hostname_resolution, parent_id=host_id)
 
         int_obj._metadata.creator = self.id
         self.__addPendingAction(modelactions.ADDINTERFACE, host_id, int_obj)