From c97ef941016352aebf4cd73c94f9565f3e2e884f Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Wed, 5 Oct 2022 13:45:06 +0200
Subject: [PATCH] fix tests

---
 tests/files/placeholder_test.csv  |   8 +--
 tests/files/placeholder_test.ods  | Bin 10054 -> 10251 bytes
 tests/files/placeholder_test.xls  | Bin 6144 -> 6144 bytes
 tests/files/placeholder_test.xlsx | Bin 5087 -> 5083 bytes
 tests/test_render_2_0.py          |  90 +++++++++++-------------------
 5 files changed, 36 insertions(+), 62 deletions(-)

diff --git a/tests/files/placeholder_test.csv b/tests/files/placeholder_test.csv
index 37579398..db9a65f7 100644
--- a/tests/files/placeholder_test.csv
+++ b/tests/files/placeholder_test.csv
@@ -1,4 +1,4 @@
-Phid;Model;Manufacturer;Serial Number;Part Number;Id device Supplier;Pallet;Info
-a123;Vaio;Sony;12345678;;TTT;24A;Good conditions
-a124;Vaio;Sony;12345679;;TTT;24A;Good conditions
-a125;Vaio;Sony;12345680;;TTT;24A;Good conditions
+Model;Manufacturer;Serial Number;Part Number;Id device Supplier;Id device Internal;Pallet;Info
+Vaio;Sony;12345678;;TTT;AA;24A;Good conditions
+Vaio;Sony;12345679;;TTT;BB;24A;Good conditions
+Vaio;Sony;12345680;;TTT;CC;24A;Good conditions
diff --git a/tests/files/placeholder_test.ods b/tests/files/placeholder_test.ods
index f41c6b35b6d2394bbbbdda338f1160cfe34fe911..b882d2bdd6c016e5725ed8f12c313cbcf4b116d6 100644
GIT binary patch
delta 6154
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

delta 6013
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

diff --git a/tests/files/placeholder_test.xls b/tests/files/placeholder_test.xls
index e9b64b1a439a772b8c4cd63587c75a65d0694e97..50b76aa3bd43db7bbfad18623a325f4dad973be9 100644
GIT binary patch
delta 404
zcmY+8&q~8U5XNUWskTX)jivD*9^z3DDN>6Hiv5Eno&<}YLlPlSvZ6)Qg9gE?m$~`?
z9wk+ZZ_;P*AoS=#bW%&93$ydheDh-_sU(%xTOB{OBFp2s-ePO`t|wXwO8{U|;DK>?
zUjlFgCkU@1KXlx<7hc3(cMjml>vqGQN^X26DV=yxmX2k7qX2X|9S%^hliaA*1wdQM
z!0}}qM7>DHmt-~?^fjBmpwY5ZLJeB!=WPlSlV_*JO~xLuW)7H*U*_)e9oK*X2LU^e
zBmP4)1C=U`2yBb$c1CAyPKJO2RT;v^$le6uQ{;a#N0TPLiPb5s%+Si1ZcJ!phE^b>
z1uj}orb-&d2a(EQYOSXWTg<3YbDshV_6N2~PJV#T?#pn<a78WmlhQS3qyBe!Uikxg
CRZ9H;

delta 353
zcmZoLXfW7N#XWfvw-qDL<g?rjf~y#$7#J7?fS84WAs{0&WpX%=mo^)aotTr8S^^aG
z%uCA$Qi+B}#y~18F%!fK&d;l4W?%>j37LGKM?w@LZvvrA|1)p_O|;+4!RyP&*fKec
zZ#yIZWIlddnZG~@Mg}GZejv@jP{#z~F#~y4tsj{tr}LXw@&ScGikN^B{0y9M9<mlD
zuogR@7Kln#pi1t^SNJt8`Jw8WQFJq-SjY_4?F7}$%mC4CCeR188t8nWP7q*WnS4n=
zZ*qd5(q<+>Ge#a$pqK+l;$p>|$u2?)92dU)IyL?H4aUieEFzm5gesUAFK+%R!p;l;
Dq8vhR

diff --git a/tests/files/placeholder_test.xlsx b/tests/files/placeholder_test.xlsx
index 28420bf21a5ea5ddad030efcdf4b5ec8cd907f6a..53b0034f77ac63a822c615dc235f406a8c2ba115 100644
GIT binary patch
delta 2803
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

delta 2912
zcmZve2{hE}8^>qHIwaeay|H8%!jx((k>yIp$TU*+eQbBEk)<?dm_iZ83~3MzuB9xc
zD1(tbO^Og@NW?_Ql@`mN?z#6==l}lB@BGgBz2EP9p7XrV`+1*HHIAAH#+rv00uU4w
z1RO}!su9@@<k|XCU_c$hBm)w7sI2Xlnub!HVB6E-(SdY5+I-W-9<_iMAZq>m+*LpK
zeDo?#9M5uaEQ4g2CW0`H64)tttRuVC8RF2H<zZ2*XdzJTpX+K<U($GB5w9WAVO32;
zVrk)dMRjL$z3^XUQN99hg-067(cSdRu+H2i9U4#CE&oL8Py!m!85$(b9TQj3;#<&K
z>42mX$EAhTP4%yI$B$D6iSYS$0g<yM`-%<y>(%GG+?Wq)r9Pf}#L^C6G!aOgY1=El
z1DNtydwI-Z{ljJrz-bfSvH1H_2GfTc2o7w_Zp$$FW492=v_#AShR>QYt9fkbQjp8_
zN?+TSPS8Fi0c%KjOk2xXtoP91d?EXJJnpnmnYCMi3;Vu#4UJPZeXY>gNp=}J8PmIN
z_(E@QcjndE^uBk~cn14s8Qw$lLvyw((&D^BR1gwc(Bf){6}>RW(7b6AHBqpc6UT$G
z77$#8VS56A0Kg~+0QhAe>;VA4-RB_Xe>USY&prYT>w!v;wku_#{UP9hkpwGxTPrkU
z-t2J|Cz8$plWjC8gQ&RLg>IuxwV|Q%8#7+2da;ZVgsNY31jOqPToD$wEYsxLdo<tE
zXI}<<0`)@X&R;C4rOREzDg8G{*efQcxiZ?7T1WYaRzey{`dC%!;$Ax^G2ucsk6j>&
zfSo)}5|~8L`ALZ6$>ZAXE)EG2by>Ud5n`VnKY+B%@~Y@W6=SPEQBmdKPE&clR1<j|
z>P{qVm?z99|GCP9qQt`pE8dl*VqZ5U71B~qg15k4zUTa7?0&9A<G^mx1iSA8i<%rZ
zMh&=XBxb2vLkrZu3^=rGVQ+R@72ib2E?eHn%=;6Y+M#A-X4LX<6;;}YUr+rkhLY)~
z?p?c2pST)o9wrcX(zcdwGO53pRP7rxajc@JCE1~Z7wwehJfayT>0n$)=hU;APX<Gv
zq#2FTxr2@Zp^EfXUoJH_K1;P~x+mFz$q-p=I3Z(_O`pQ{NhJ?CIpz+38z;OBmCraV
zz6*8NFa4Zc4l?y4y9}3{u=d@{XSQbpLyO+E_&39<0Z^@}ObK8jj_8toKY12TSDxR2
z(=e1vs(42%x!p}FHkrrqSIk)yw?^h28yzfL`dW*Lt9LKEFY>vw_lw80h^}+N?S$+9
zK0&?cw5Zwa@B<@o0+Ny!t~;iRe82e$-Phdo{mF&RJ<aonE>eRG7QV-nuEag+Z!X1e
z20vcC8ED!c&upf;>YfM_wfHFdZ3iKWqa9rpx@z5_MKKmS3_gPrd@+6P1b^Zr5<KJg
zr9#C<fH7OaC>}fov+vYb2!#>e?ie(XTRh=D>1vnPvL_;ISp(QkKsZQAl2-gmz96@2
z*9@(dLffj_3W?up_b!`X7xV)nykK?0iN}Z?{NskU;#2He+Wx|_`NVV+c@xU%`Wqe2
zD#a&~DalMD;Lg|S`mnEa?lijZ_x&-EtzFufii&ouCPT@=vh#HF->cb3r!Y|MIFDz=
zv#!`t*Mq%QRP5W+*Wgd(yrZSVKyHaLWsUM?bVaK75!rkd(v<jqo3Vi>QzK}?`0)xQ
zAJpwTLr%Ex1(}75+U0d0WzV@TE7VTNT*`EPi0F{y1|tnda|RAg3$FtUNESL2ldk~t
z9`Rd$d0cx=Jo79jR`T?mV#($g%Zh#Zuj2y?-oG*oySkd=1C9_>7POC3B~^|4D6A6M
z%EPP7u9p?g8RrFAw04yb*jF($cv^F2>j!uL9-UcZ;C9-cL@;DUwvN0v&+loo7n1tt
zxQ7U95}t&Q>WMWjoT-lP3Q*x{jTUCru2kResd34moSGL=HWkN-c>pje>&Wj~-@Oe1
z&>|CqsgZ=ZYV!4C-UuVe=*D|@aO6&h<E^g-<|7~8NpNg2Z~bhyIy%XnB!4(gc1Tk9
zi{=`8&tA-5pMW+*XYTLl0fJzq!Ih_Cr(zBy5yD75mrHX@VQ-a9g=k(2-KRVtxi;XH
zZ*M*hTZ?%HvqM$KT3NS}c%xYf`&j6yy&yZr%?mP=Q#5>YD{_epQkW>m8P!Qh#gx4L
zAR>1G4Cc)~g3XIpvj}+V>=v8tw~8h`fY20|vWlTZJ@S)zK~?Unff@D%^9@CM5{67@
zm)b+p7B7-8*S0v{*v@qh{KU;TYH|~OUYDbJ_}N;ziE!OqTFdhR=114tmt{Qx9I$cE
zh@WN0T0QC8ffOGrKhgtIVpO7Ml19cZR@Iu``v{TL`0jGGjgG#W1BzY7mxLBV85$_^
zIcId(%}@u<gKh}f{Qk4<wEh&uHt`<9UoTW!!d$YJcupOOydJE^hsx)wOy^+ZY=*!G
zKkJM`MP1*Mmwn_Eg>1NykLp&KuYxTj4Hx=!pP`*oDlbZ(qaU43pPmoQ=+%liZ^wYr
zi-d+u#f-)qb8%Ho><0#)O2v7@scyOT8x2{$I2b=e+W_eL#nfz<xhs?HkKhtgJJwIW
zRKws>BcCa~S!hXE2L)zj6m1>}`CGx*Lnzt~W5loaZgrV0q|S9zB>OgvTMFFk%VRU%
zTJ0=P)60WW5N(yHcQYJ_PdRW!9aWrvEqsP2j(+-duAS%I#2L@Q6(-LqSxC|iSW#43
z4pMymY+F&XG+l*e)3zvI6G%`#_C9G8=5-;>0Vz%qnjnIxJJzFUg&g&{*381>`g=b9
z%CR)s6@$d7^bHR^S=-8fnrffsBaT^cDl161EjJ-j*r!jsWjv2h`k>}r{>2h-%`ShX
znqAV3CGqWb^20*+(np2vnc(@H6syz`7yS4xJ?*I!So>E-kZvk!A@jNH4B~U@+Iki5
zgS5n)fmNT~j`Mj2Qe>;9+dOu*xaak@ZTRe+6O_*V^m5NxQ#U=kBsL4+6&BcZt|o=|
zX=3)HBAw%NV0m=vo0)SkDay$S(-YRw)^buuxVGg`>1zsS5TZfXhok9|rfm)7x0yW|
zIJh(saz%>}14M>`^D3^VB?*?@tE+#Oslevsbug(R%U+JmCRfY;;6#1Hcb1=}z3&ru
zw&VzbL=b7w+!7acqTq0vf(5JpkT9X`5Bp1fz)fdecVJGszU{p_+Q`xUNjQnBIW8W)
z8&0g!kITR&*zFyMv!)iO-Z)*~qpy^#+?Nc0Odx2K?FeZNjnOm8(k-~`84UM>Vlpr0
z-rztl`ntr$^6F~lokx_r$B>2#8e*QD<sbZT<LFRRl-Kjb7_H4KixV7z$IWzan&_o^
zk7edJ3s1-O2M524Zu6&=s2pd@3jl<P{KlW{mgB#1mrpG99~e=^4}-TFLi-=B3S~h2
z@DH+!NXP+M6u1PGus!$lRj{?}PlLNfxoEu3*@zfC?yPon5FTR<1VI4*^_%tuUrNDW
zw{RG=B^3S12mn0d|6z>^3IEe8B;?QkXWn9|^nWmg{Ni4sa3oZq+ril`evN&xHK)3D
zSIPdOF`+0)!WFkQKPN@{7mbrJ<)W~x=I>$GW~LFHw!%Kc2LMR^VpyP5Ny7M3#J7L`
E4{#Oy5dZ)H

diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py
index 0ffb4f91..e65140b1 100644
--- a/tests/test_render_2_0.py
+++ b/tests/test_render_2_0.py
@@ -562,7 +562,6 @@ def test_update_monitor(user3: UserClientFlask):
     data = {
         'csrf_token': generate_csrf(),
         'type': "Monitor",
-        'phid': '1',
         'serial_number': "AAAAB",
         'model': "LCD 43 b",
         'manufacturer': "Samsung",
@@ -575,8 +574,9 @@ def test_update_monitor(user3: UserClientFlask):
     }
     body, status = user3.post(uri, data=data)
     assert status == '200 OK'
-    assert 'Error, exist one Placeholder device with this PHID' in body
-    dev = Device.query.one()
+    # assert 'Error, exist one Placeholder device with this PHID' in body
+    dev = Device.query.all()[0]
+    assert Device.query.count() == 2
     assert dev.type == 'Monitor'
     assert dev.placeholder.id_device_supplier == "b2"
     assert dev.hid == 'monitor-samsung-lc27t55-aaaab'
@@ -597,7 +597,6 @@ def test_add_2_monitor(user3: UserClientFlask):
     data = {
         'csrf_token': generate_csrf(),
         'type': "Monitor",
-        'phid': "AAB",
         'serial_number': "AAAAB",
         'model': "LC27T55",
         'manufacturer': "Samsung",
@@ -619,7 +618,7 @@ def test_add_2_monitor(user3: UserClientFlask):
     assert typ == 'Monitor'
     assert dev.placeholder.id_device_supplier == "b1"
     assert dev.hid == 'monitor-samsung-lc27t55-aaaab'
-    assert phid == 'AAB'
+    assert phid == '1'
     assert dhid == 'O48N2'
     assert dev.model == 'lc27t55'
     assert dev.placeholder.pallet == "l34"
@@ -737,35 +736,6 @@ def test_add_with_ammount_laptops(user3: UserClientFlask):
     assert Device.query.count() == num
 
 
-@pytest.mark.mvp
-@pytest.mark.usefixtures(conftest.app_context.__name__)
-def test_add_laptop_duplicate(user3: UserClientFlask):
-
-    uri = '/inventory/device/add/'
-    body, status = user3.get(uri)
-    assert status == '200 OK'
-    assert "New Device" in body
-
-    data = {
-        'csrf_token': generate_csrf(),
-        'type': "Laptop",
-        'phid': 'laptop-asustek_computer_inc-1001pxd-b8oaas048285-14:da:e9:42:f6:7b',
-        'serial_number': "AAAAB",
-        'model': "LC27T55",
-        'manufacturer': "Samsung",
-        'generation': 1,
-        'weight': 0.1,
-        'height': 0.1,
-        'depth': 0.1,
-    }
-    body, status = user3.post(uri, data=data)
-    assert status == '200 OK'
-    assert Device.query.count() == 1
-    body, status = user3.post(uri, data=data)
-    assert 'Error, exist one Placeholder device with this PHID' in body
-    assert Device.query.count() == 1
-
-
 @pytest.mark.mvp
 @pytest.mark.usefixtures(conftest.app_context.__name__)
 def test_filter_monitor(user3: UserClientFlask):
@@ -1729,7 +1699,7 @@ def test_add_placeholder_excel(user3: UserClientFlask):
     assert Device.query.count() == 3
     dev = Device.query.first()
     assert dev.hid == 'laptop-sony-vaio-12345678'
-    assert dev.placeholder.phid == 'a123'
+    assert dev.placeholder.phid == '1'
     assert dev.placeholder.info == 'Good conditions'
     assert dev.placeholder.pallet == '24A'
     assert dev.placeholder.id_device_supplier == 'TTT'
@@ -1755,7 +1725,7 @@ def test_add_placeholder_csv(user3: UserClientFlask):
     assert Device.query.count() == 3
     dev = Device.query.first()
     assert dev.hid == 'laptop-sony-vaio-12345678'
-    assert dev.placeholder.phid == 'a123'
+    assert dev.placeholder.phid == '1'
     assert dev.placeholder.info == 'Good conditions'
     assert dev.placeholder.pallet == '24A'
     assert dev.placeholder.id_device_supplier == 'TTT'
@@ -1781,7 +1751,7 @@ def test_add_placeholder_ods(user3: UserClientFlask):
     assert Device.query.count() == 3
     dev = Device.query.first()
     assert dev.hid == 'laptop-sony-vaio-12345678'
-    assert dev.placeholder.phid == 'a123'
+    assert dev.placeholder.phid == '1'
     assert dev.placeholder.info == 'Good conditions'
     assert dev.placeholder.pallet == '24A'
     assert dev.placeholder.id_device_supplier == 'TTT'
@@ -1809,10 +1779,11 @@ def test_add_placeholder_office_open_xml(user3: UserClientFlask):
     assert Device.query.count() == 3
     dev = Device.query.first()
     assert dev.hid == 'laptop-sony-vaio-12345678'
-    assert dev.placeholder.phid == 'a123'
+    assert dev.placeholder.phid == '1'
     assert dev.placeholder.info == 'Good conditions'
     assert dev.placeholder.pallet == '24A'
     assert dev.placeholder.id_device_supplier == 'TTT'
+    assert dev.placeholder.id_device_internal == 'AA'
 
 
 @pytest.mark.mvp
@@ -1921,8 +1892,8 @@ def test_placeholder_log_manual_edit(user3: UserClientFlask):
     data = {
         'csrf_token': generate_csrf(),
         'type': "Laptop",
-        'phid': 'ace',
         'serial_number': "AAAAB",
+        'part_number': "AAAAB",
         'model': "LC27T55",
         'manufacturer': "Samsung",
         'generation': 1,
@@ -1930,9 +1901,13 @@ def test_placeholder_log_manual_edit(user3: UserClientFlask):
         'height': 0.1,
         'depth': 0.1,
         'id_device_supplier': "b2",
+        'id_device_internal': "b2i",
     }
     user3.post(uri, data=data)
     dev = Device.query.one()
+    plz = Placeholder.query.first()
+    assert plz.id_device_supplier == "b2"
+    assert plz.id_device_internal == "b2i"
 
     uri = '/inventory/device/edit/{}/'.format(dev.devicehub_id)
     user3.get(uri)
@@ -1948,16 +1923,20 @@ def test_placeholder_log_manual_edit(user3: UserClientFlask):
         'height': 0.1,
         'depth': 0.1,
         'id_device_supplier': "a2",
+        'id_device_internal': "a2i",
     }
     user3.post(uri, data=data)
+    plz = Placeholder.query.first()
+    assert plz.id_device_supplier == "a2"
+    assert plz.id_device_internal == "a2i"
 
     uri = '/inventory/placeholder-logs/'
     body, status = user3.get(uri)
     assert status == '200 OK'
     assert "Placeholder Logs" in body
-    assert "Web form" in body
-    assert "ace" in body
     assert "Update" in body
+    assert "Web form" in body
+    assert "1" in body
     assert dev.devicehub_id in body
     assert "✓" in body
     assert "CSV" not in body
@@ -1980,7 +1959,7 @@ def test_placeholder_log_excel_new(user3: UserClientFlask):
         }
         user3.post(uri, data=data, content_type="multipart/form-data")
     dev = Device.query.first()
-    assert dev.placeholder.phid == 'a123'
+    assert dev.placeholder.phid == '1'
 
     uri = '/inventory/placeholder-logs/'
     body, status = user3.get(uri)
@@ -1989,7 +1968,6 @@ def test_placeholder_log_excel_new(user3: UserClientFlask):
     assert dev.placeholder.phid in body
     assert dev.devicehub_id in body
     assert "Web form" not in body
-    assert "Update" not in body
     assert "New device" in body
     assert "✓" in body
     assert "CSV" not in body
@@ -2023,7 +2001,7 @@ def test_placeholder_log_excel_update(user3: UserClientFlask):
         user3.post(uri, data=data, content_type="multipart/form-data")
 
     dev = Device.query.first()
-    assert dev.placeholder.phid == 'a123'
+    assert dev.placeholder.phid == '1'
 
     uri = '/inventory/placeholder-logs/'
     body, status = user3.get(uri)
@@ -2032,7 +2010,6 @@ def test_placeholder_log_excel_update(user3: UserClientFlask):
     assert dev.placeholder.phid in body
     assert dev.devicehub_id in body
     assert "Web form" not in body
-    assert "Update" in body
     assert "New device" in body
     assert "✓" in body
     assert "CSV" in body
@@ -2070,7 +2047,7 @@ def test_add_placeholder_excel_from_lot(user3: UserClientFlask):
     assert Device.query.count() == 3
     dev = Device.query.first()
     assert dev.hid == 'laptop-sony-vaio-12345678'
-    assert dev.placeholder.phid == 'a123'
+    assert dev.placeholder.phid == '1'
     assert dev.placeholder.info == 'Good conditions'
     assert dev.placeholder.pallet == '24A'
     assert dev.placeholder.id_device_supplier == 'TTT'
@@ -2097,7 +2074,6 @@ def test_add_new_placeholder_from_lot(user3: UserClientFlask):
     data = {
         'csrf_token': generate_csrf(),
         'type': "Laptop",
-        'phid': 'ace',
         'serial_number': "AAAAB",
         'model': "LC27T55",
         'manufacturer': "Samsung",
@@ -2110,7 +2086,7 @@ def test_add_new_placeholder_from_lot(user3: UserClientFlask):
     user3.post(uri, data=data)
     dev = Device.query.one()
     assert dev.hid == 'laptop-samsung-lc27t55-aaaab'
-    assert dev.placeholder.phid == 'ace'
+    assert dev.placeholder.phid == '1'
     assert len(lot.devices) == 1
 
 
@@ -2124,7 +2100,6 @@ def test_manual_binding(user3: UserClientFlask):
     data = {
         'csrf_token': generate_csrf(),
         'type': "Laptop",
-        'phid': 'sid',
         'serial_number': "AAAAB",
         'model': "LC27T55",
         'manufacturer': "Samsung",
@@ -2136,7 +2111,7 @@ def test_manual_binding(user3: UserClientFlask):
     user3.post(uri, data=data)
     dev = Device.query.one()
     assert dev.hid == 'laptop-samsung-lc27t55-aaaab'
-    assert dev.placeholder.phid == 'sid'
+    assert dev.placeholder.phid == '1'
     assert dev.placeholder.is_abstract is False
 
     # add device from wb
@@ -2155,7 +2130,7 @@ def test_manual_binding(user3: UserClientFlask):
 
     # page binding
     dhid = dev_wb.dhid
-    uri = f'/inventory/binding/{dhid}/sid/'
+    uri = f'/inventory/binding/{dhid}/1/'
     body, status = user3.get(uri)
     assert status == '200 OK'
     assert 'sid' in body
@@ -2174,7 +2149,7 @@ def test_manual_binding(user3: UserClientFlask):
     assert txt in body
 
     # check new structure
-    assert dev_wb.binding.phid == 'sid'
+    assert dev_wb.binding.phid == '1'
     assert dev_wb.binding.device == dev
     assert Placeholder.query.filter_by(id=old_placeholder.id).first() is None
     assert Device.query.filter_by(id=old_placeholder.device.id).first() is None
@@ -2237,7 +2212,6 @@ def test_unbinding(user3: UserClientFlask):
     data = {
         'csrf_token': generate_csrf(),
         'type': "Laptop",
-        'phid': 'sid',
         'serial_number': "AAAAB",
         'model': "LC27T55",
         'manufacturer': "Samsung",
@@ -2262,7 +2236,7 @@ def test_unbinding(user3: UserClientFlask):
 
     # page binding
     dhid = dev_wb.dhid
-    uri = f'/inventory/binding/{dhid}/sid/'
+    uri = f'/inventory/binding/{dhid}/1/'
     user3.get(uri)
 
     # action binding
@@ -2272,10 +2246,10 @@ def test_unbinding(user3: UserClientFlask):
 
     dhid = dev.dhid
     # action unbinding
-    uri = '/inventory/unbinding/sid/'
+    uri = '/inventory/unbinding/1/'
     body, status = user3.post(uri, data={})
     assert status == '200 OK'
-    txt = f'Device with PHID:&#34;sid&#34; and DHID: {dhid} unbind successfully!'
+    txt = f'Device with PHID:&#34;1&#34; and DHID: {dhid} unbind successfully!'
     assert txt in body
     # assert 'Device &#34;sid&#34; unbind successfully!' in body
 
@@ -2400,8 +2374,8 @@ def test_bug_3821_binding(user3: UserClientFlask):
     user3.post(uri, data=data)
     dev = Device.query.one()
     dhid = dev.dhid
-    assert dev.phid() == 'sid'
-    uri = f'/inventory/binding/{dhid}/sid/'
+    assert dev.phid() == '1'
+    uri = f'/inventory/binding/{dhid}/1/'
     body, status = user3.get(uri)
     assert status == '200 OK'
     assert 'is not a Snapshot device!' in body