Merge 956782f into 164351e

Chaffelson · Oct 31, 2020 · 3a90150 · 3a90150
2 parents 164351e + 956782f
commit 3a90150
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/nipyapi/canvas.py b/nipyapi/canvas.py
@@ -1536,13 +1536,13 @@ def create_funnel(pg_id, position=None):
         return nipyapi.nifi.ProcessGroupsApi().create_funnel(
             id=pg_id,
             body=nipyapi.nifi.FunnelEntity(
-                position=nipyapi.nifi.PositionDTO(
-                    x=float(position[0]),
-                    y=float(position[1])
-                ),
                 revision=nipyapi.nifi.RevisionDTO(version=0),
                 component=nipyapi.nifi.FunnelDTO(
-                    parent_group_id=pg_id
+                    parent_group_id=pg_id,
+                    position=nipyapi.nifi.PositionDTO(
+                        x=float(position[0]),
+                        y=float(position[1])
+                    ),
                 )
             )
         )

diff --git a/tests/test_canvas.py b/tests/test_canvas.py
@@ -657,6 +657,8 @@ def test_connect_output_ports(regress_nifi, fix_pg):
 def test_create_funnel(regress_nifi, fix_funnel):
     f_f1 = fix_funnel.generate()
     assert isinstance(f_f1, nifi.FunnelEntity)
+    assert f_f1.component.position.x == 400
+    assert f_f1.component.position.y == 400
 
 
 def test_delete_funnel(regress_nifi, fix_funnel):