Fix CI (#453)

* MacOs Tieline unit tests reference fixes iidm v1.0, v1.1, v1.2, v1.3, v1.4 * Use java 17 in QA CI * Use sonarcloud-github-c-cpp gh action in QA CI * Use latest actions versions in CI * Remove sonar.cfamily.build-wrapper-output property Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com> (cherry picked from commit 77dfcf7)
powsybl · Jul 25, 2024 · 578ba3c · 578ba3c
1 parent 8be26c6
commit 578ba3c
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 73 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
           sudo apt-get install -y libboost-all-dev
 
       - name: Checkout sources
-        uses: actions/checkout@v1
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Configure CMake
         run: >
@@ -53,7 +53,7 @@ jobs:
         run: brew install boost
 
       - name: Checkout sources
-        uses: actions/checkout@v1
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Configure CMake
         run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build-macos -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=ON
@@ -94,7 +94,7 @@ jobs:
           boost-installer.exe /dir=%BOOST_ROOT% /sp- /verysilent /suppressmsgboxes /norestart
 
       - name: Checkout sources
-        uses: actions/checkout@v1
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Configure CMake
         shell: cmd
@@ -119,53 +119,35 @@ jobs:
   qa:
     name: QA
     runs-on: ubuntu-latest
+    env:
+      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
     steps:
-      - name: Install Java 11
-        uses: actions/setup-java@v1
+      - name: Install Java 17
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Install gcovr
         run: |
           sudo apt-get update -y
           sudo apt-get install -y gcovr
 
-      - name: Install Sonar wrapper
-        working-directory: ${{ runner.workspace }}
-        run: |
-          wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
-          unzip build-wrapper-linux-x86.zip
-
-      - name: Install Sonar scanner
-        working-directory: ${{ runner.workspace }}
-        run: |
-          wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip
-          unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip
-          ln -s sonar-scanner-${SONAR_SCANNER_VERSION} sonar
-          rm sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip
-        env:
-          SONAR_SCANNER_VERSION: 3.3.0.1492
-
       - name: Install Boost
         run: |
           sudo apt-get update -y
           sudo apt-get install -y libboost-all-dev
-
+   
       - name: Checkout sources
-        uses: actions/checkout@v1
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
-      - name: Configure CMake
-        run: >
-          cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
-          -DCMAKE_BUILD_TYPE=Debug
-          -DCODE_COVERAGE=TRUE
-          -DBUILD_EXAMPLES=ON
+      - name: Install sonar-scanner and build-wrapper
+        uses: SonarSource/sonarcloud-github-c-cpp@816b1822d71776ee0d32bc012e95024ec52ac1fc # v3.1.0
 
       - name: Build
-        run:  >
-          ${{ runner.workspace }}/build-wrapper-linux-x86/build-wrapper-linux-x86-64
-          --out-dir $GITHUB_WORKSPACE/build/output
-          cmake --build $GITHUB_WORKSPACE/build --parallel 2
+        run: |
+          cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=TRUE -DBUILD_EXAMPLES=ON
+          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build $GITHUB_WORKSPACE/build --parallel 2
 
       - name: Tests
         run: >
@@ -177,10 +159,9 @@ jobs:
         run: cmake --build $GITHUB_WORKSPACE/build --target code-coverage
 
       - name: Sonarcloud
-        working-directory: ${{ runner.workspace }}/powsybl-iidm4cpp
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: >
-          ${{ runner.workspace }}/sonar/bin/sonar-scanner
-          -Dsonar.host.url=https://sonarcloud.io
+        run: |
+          sonar-scanner --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"
+
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -14,6 +14,5 @@ sonar.cxx.includedirectories=include,extensions/entsoe/include,extensions/iidm/i
 sonar.sources=src,include,extensions/entsoe/src,extensions/entsoe/include,extensions/iidm/src,extensions/iidm/include,extensions/sld/src,extensions/sld/include
 sonar.tests=test,extensions/entsoe/test,extensions/iidm/test,extensions/sld/test
 
-sonar.cfamily.build-wrapper-output=build/output
 sonar.coverageReportPaths=build/coverage/coverage.xml
 sonar.cfamily.threads=2
diff --git a/test/resources/V1_0/tieline.xml.macos b/test/resources/V1_0/tieline.xml.macos
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169703" xnodeQ_1="-118.85058330380788" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598193"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169703" xnodeQ_1="-118.85058330380788" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598193"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169697" xnodeQ_1="-118.85058330380789" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518362" xnodeQ_2="118.76748245598193"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169697" xnodeQ_1="-118.85058330380789" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518362" xnodeQ_2="118.76748245598193"/>
 </iidm:network>
diff --git a/test/resources/V1_0/tielineFictitious.xml.macos b/test/resources/V1_0/tielineFictitious.xml.macos
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169703" xnodeQ_1="-118.85058330380788" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598193"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169703" xnodeQ_1="-118.85058330380788" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598193"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169697" xnodeQ_1="-118.85058330380789" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518362" xnodeQ_2="118.76748245598193"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169697" xnodeQ_1="-118.85058330380789" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518362" xnodeQ_2="118.76748245598193"/>
 </iidm:network>
diff --git a/test/resources/V1_0/tl-loading-limits.xml.macos b/test/resources/V1_0/tl-loading-limits.xml.macos
@@ -37,7 +37,7 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169703" xnodeQ_1="-118.85058330380788" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598193">
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169697" xnodeQ_1="-118.85058330380789" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518362" xnodeQ_2="118.76748245598193">
         <iidm:currentLimits1 permanentLimit="350">
             <iidm:temporaryLimit name="20'" acceptableDuration="1200" value="370"/>
             <iidm:temporaryLimit name="10'" acceptableDuration="600" value="380"/>
@@ -47,5 +47,5 @@
             <iidm:temporaryLimit name="10'" acceptableDuration="600" value="380"/>
         </iidm:currentLimits2>
     </iidm:tieLine>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169703" xnodeQ_1="-118.85058330380788" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598193"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169697" xnodeQ_1="-118.85058330380789" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518362" xnodeQ_2="118.76748245598193"/>
 </iidm:network>
diff --git a/test/resources/V1_1/tieline.xml.macos b/test/resources/V1_1/tieline.xml.macos
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169703" xnodeQ_1="-118.85058330380788" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598193"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169703" xnodeQ_1="-118.85058330380788" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598193"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169697" xnodeQ_1="-118.85058330380789" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518362" xnodeQ_2="118.76748245598193"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169697" xnodeQ_1="-118.85058330380789" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518362" xnodeQ_2="118.76748245598193"/>
 </iidm:network>
diff --git a/test/resources/V1_1/tielineFictitious.xml.macos b/test/resources/V1_1/tielineFictitious.xml.macos
@@ -37,6 +37,6 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169703" xnodeQ_1="-118.85058330380788" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598193"/>
-    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169703" xnodeQ_1="-118.85058330380788" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518373" xnodeQ_2="118.76748245598193"/>
+    <iidm:tieLine id="NHV1_NHV2_1" ucteXnodeCode="X1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_1.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169697" xnodeQ_1="-118.85058330380789" id_2="NHV1_NHV2_1.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518362" xnodeQ_2="118.76748245598193"/>
+    <iidm:tieLine id="NHV1_NHV2_2" ucteXnodeCode="X2" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.44406127929688" q1="98.740272521972656" p2="-300.43389892578125" q2="-137.18849182128906" id_1="NHV1_NHV2_2.1" r_1="1.5" x_1="16.5" g1_1="0" b1_1="9.6500000000000001e-05" g2_1="0" b2_1="9.6500000000000001e-05" xnodeP_1="-301.47434650169697" xnodeQ_1="-118.85058330380789" id_2="NHV1_NHV2_2.2" r_2="1.5" x_2="16.5" g1_2="0" b1_2="9.6500000000000001e-05" g2_2="0" b2_2="9.6500000000000001e-05" xnodeP_2="301.47231962518362" xnodeQ_2="118.76748245598193"/>
 </iidm:network>