[minigraph][dualtor] Support parsing `soc_ip` out of dpg #11207

lolyu · 2022-06-21T08:38:22Z

Why I did it

To further support parse out soc_ipv4 and soc_ipv6 out of Dpg:

<DeviceDataPlaneInfo>
  <IPSecTunnels />
  <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
    <a:LoopbackIPInterface>
      <ElementType>LoopbackInterface</ElementType>
      <Name>HostIP</Name>
      <AttachTo>Loopback0</AttachTo>
      <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux">
        <b:IPPrefix>10.10.10.2/32</b:IPPrefix>
      </a:Prefix>
      <a:PrefixStr>10.10.10.2/32</a:PrefixStr>
    </a:LoopbackIPInterface>
    <a:LoopbackIPInterface>
      <ElementType>LoopbackInterface</ElementType>
      <Name>HostIP1</Name>
      <AttachTo>Loopback0</AttachTo>
      <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux">
        <b:IPPrefix>fe80::0002/128</b:IPPrefix>
      </a:Prefix>
      <a:PrefixStr>fe80::0002/128</a:PrefixStr>
    </a:LoopbackIPInterface>
    <a:LoopbackIPInterface>
      <ElementType>LoopbackInterface</ElementType>
      <Name>SoCHostIP0</Name>
      <AttachTo>server2SOC</AttachTo>
      <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux">
        <b:IPPrefix>10.10.10.3/32</b:IPPrefix>
      </a:Prefix>
      <a:PrefixStr>10.10.10.3/32</a:PrefixStr>
    </a:LoopbackIPInterface>
    <a:LoopbackIPInterface>
      <ElementType>LoopbackInterface</ElementType>
      <Name>SoCHostIP1</Name>
      <AttachTo>server2SOC</AttachTo>
      <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux">
        <b:IPPrefix>fe80::0003/128</b:IPPrefix>
      </a:Prefix>
      <a:PrefixStr>fe80::0003/128</a:PrefixStr>
    </a:LoopbackIPInterface>
  </LoopbackIPInterfaces>
</DeviceDataPlaneInfo>

Signed-off-by: Longxiang Lyu [email protected]

How I did it

For servers loopback definitions in Dpg, if they contain LoopbackIPInterface with tags AttachTo, which has value of format like <server_name>SOC, the address will be regarded as a SoC IP, and sonic-cfggen now will treat the port connected to the server as active-active if the redundancy_type is either Libra or Mixed.

How to verify it

Pass the unittest.

Which release branch to backport (provide reason below if selected)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

lgtm-com · 2022-06-21T09:05:39Z

This pull request introduces 1 alert when merging 161b624e64a2b24528f0bb4fbe46e920b3b2b819 into 0ae4903 - view on LGTM.com

new alerts:

1 for Redundant assignment

Signed-off-by: Longxiang Lyu <[email protected]>

lgtm-com · 2022-07-05T01:56:36Z

This pull request introduces 2 alerts when merging 0245672 into 4fb6cf0 - view on LGTM.com

new alerts:

1 for Variable defined multiple times
1 for Redundant assignment

Signed-off-by: Longxiang Lyu <[email protected]>

lolyu · 2022-07-05T13:36:07Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2022-07-05T13:36:20Z

Azure Pipelines successfully started running 1 pipeline(s).

Why I did it To further support parse out soc_ipv4 and soc_ipv6 out of Dpg: <DeviceDataPlaneInfo> <IPSecTunnels /> <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"> <a:LoopbackIPInterface> <ElementType>LoopbackInterface</ElementType> <Name>HostIP</Name> <AttachTo>Loopback0</AttachTo> <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux"> <b:IPPrefix>10.10.10.2/32</b:IPPrefix> </a:Prefix> <a:PrefixStr>10.10.10.2/32</a:PrefixStr> </a:LoopbackIPInterface> <a:LoopbackIPInterface> <ElementType>LoopbackInterface</ElementType> <Name>HostIP1</Name> <AttachTo>Loopback0</AttachTo> <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux"> <b:IPPrefix>fe80::0002/128</b:IPPrefix> </a:Prefix> <a:PrefixStr>fe80::0002/128</a:PrefixStr> </a:LoopbackIPInterface> <a:LoopbackIPInterface> <ElementType>LoopbackInterface</ElementType> <Name>SoCHostIP0</Name> <AttachTo>server2SOC</AttachTo> <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux"> <b:IPPrefix>10.10.10.3/32</b:IPPrefix> </a:Prefix> <a:PrefixStr>10.10.10.3/32</a:PrefixStr> </a:LoopbackIPInterface> <a:LoopbackIPInterface> <ElementType>LoopbackInterface</ElementType> <Name>SoCHostIP1</Name> <AttachTo>server2SOC</AttachTo> <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux"> <b:IPPrefix>fe80::0003/128</b:IPPrefix> </a:Prefix> <a:PrefixStr>fe80::0003/128</a:PrefixStr> </a:LoopbackIPInterface> </LoopbackIPInterfaces> </DeviceDataPlaneInfo> Signed-off-by: Longxiang Lyu [email protected] How I did it For servers loopback definitions in Dpg, if they contain LoopbackIPInterface with tags AttachTo, which has value of format like <server_name>SOC, the address will be regarded as a SoC IP, and sonic-cfggen now will treat the port connected to the server as active-active if the redundancy_type is either Libra or Mixed. How to verify it Pass the unittest. Signed-off-by: Longxiang Lyu <[email protected]>

Approach What is the motivation for this PR? Support the minigraph generation for the new schema for SoC IP. Depends on: sonic-net/sonic-buildimage#11207 Signed-off-by: Longxiang Lyu [email protected] How did you do it? Add the SoC IP related information to Dpg How did you verify/test it? Test together with sonic-net/sonic-buildimage#11207 to verify the mux cable table generation Any platform specific information?

…1207) Why I did it To further support parse out soc_ipv4 and soc_ipv6 out of Dpg: <DeviceDataPlaneInfo> <IPSecTunnels /> <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"> <a:LoopbackIPInterface> <ElementType>LoopbackInterface</ElementType> <Name>HostIP</Name> <AttachTo>Loopback0</AttachTo> <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux"> <b:IPPrefix>10.10.10.2/32</b:IPPrefix> </a:Prefix> <a:PrefixStr>10.10.10.2/32</a:PrefixStr> </a:LoopbackIPInterface> <a:LoopbackIPInterface> <ElementType>LoopbackInterface</ElementType> <Name>HostIP1</Name> <AttachTo>Loopback0</AttachTo> <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux"> <b:IPPrefix>fe80::0002/128</b:IPPrefix> </a:Prefix> <a:PrefixStr>fe80::0002/128</a:PrefixStr> </a:LoopbackIPInterface> <a:LoopbackIPInterface> <ElementType>LoopbackInterface</ElementType> <Name>SoCHostIP0</Name> <AttachTo>server2SOC</AttachTo> <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux"> <b:IPPrefix>10.10.10.3/32</b:IPPrefix> </a:Prefix> <a:PrefixStr>10.10.10.3/32</a:PrefixStr> </a:LoopbackIPInterface> <a:LoopbackIPInterface> <ElementType>LoopbackInterface</ElementType> <Name>SoCHostIP1</Name> <AttachTo>server2SOC</AttachTo> <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux"> <b:IPPrefix>fe80::0003/128</b:IPPrefix> </a:Prefix> <a:PrefixStr>fe80::0003/128</a:PrefixStr> </a:LoopbackIPInterface> </LoopbackIPInterfaces> </DeviceDataPlaneInfo> Signed-off-by: Longxiang Lyu [email protected] How I did it For servers loopback definitions in Dpg, if they contain LoopbackIPInterface with tags AttachTo, which has value of format like <server_name>SOC, the address will be regarded as a SoC IP, and sonic-cfggen now will treat the port connected to the server as active-active if the redundancy_type is either Libra or Mixed. How to verify it Pass the unittest. Signed-off-by: Longxiang Lyu <[email protected]>

Related work items: sonic-net#284, sonic-net#288, sonic-net#624, sonic-net#630, sonic-net#640, sonic-net#2164, sonic-net#2206, sonic-net#2207, sonic-net#2233, sonic-net#2234, sonic-net#2238, sonic-net#8857, sonic-net#10034, sonic-net#10519, sonic-net#10685, sonic-net#10711, sonic-net#10987, sonic-net#10990, sonic-net#11047, sonic-net#11070, sonic-net#11117, sonic-net#11186, sonic-net#11207, sonic-net#11213, sonic-net#11215, sonic-net#11220, sonic-net#11221, sonic-net#11257, sonic-net#11291, sonic-net#11298, sonic-net#11301, sonic-net#11326, sonic-net#11333, sonic-net#11335, sonic-net#11341, sonic-net#11344, sonic-net#11347, sonic-net#11359, sonic-net#11366, sonic-net#11368, sonic-net#11370, sonic-net#11372, sonic-net#11375, sonic-net#11385, sonic-net#11386, sonic-net#11394, sonic-net#11397, sonic-net#11401, sonic-net#11402, sonic-net#11403, sonic-net#11405, sonic-net#11414

lolyu requested a review from a team as a code owner June 21, 2022 08:38

lolyu requested a review from yxieca June 21, 2022 08:39

lolyu force-pushed the add_soc_ip branch from a219d73 to 637e2f8 Compare June 23, 2022 01:09

lolyu mentioned this pull request Jun 23, 2022

[dualtor][minigraph] Support new minigraph schema for SoC IP sonic-net/sonic-mgmt#5863

Merged

5 tasks

yxieca approved these changes Jul 4, 2022

View reviewed changes

lolyu added 4 commits July 5, 2022 01:05

[sonic-conffig-engine][dualtor] Support parsing soc_ip out of dpg

9cedd8c

Signed-off-by: Longxiang Lyu <[email protected]>

Modify soc check

696a8eb

Signed-off-by: Longxiang Lyu <[email protected]>

Fix redundancy_type assignment

082e26f

Signed-off-by: Longxiang Lyu <[email protected]>

Use %s to format string

921c671

Signed-off-by: Longxiang Lyu <[email protected]>

lolyu force-pushed the add_soc_ip branch from 637e2f8 to 921c671 Compare July 5, 2022 01:08

Improve code logic

0245672

Signed-off-by: Longxiang Lyu <[email protected]>

Fix lgtm

494941b

Signed-off-by: Longxiang Lyu <[email protected]>

yxieca added the Request for 202205 Branch label Jul 5, 2022

yxieca merged commit b9a7665 into sonic-net:master Jul 5, 2022

yxieca added the Included in 202205 Branch label Jul 5, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[minigraph][dualtor] Support parsing `soc_ip` out of dpg #11207

[minigraph][dualtor] Support parsing `soc_ip` out of dpg #11207

lolyu commented Jun 21, 2022 •

edited

Loading

lgtm-com bot commented Jun 21, 2022

lgtm-com bot commented Jul 5, 2022

lolyu commented Jul 5, 2022

azure-pipelines bot commented Jul 5, 2022

[minigraph][dualtor] Support parsing soc_ip out of dpg #11207

[minigraph][dualtor] Support parsing soc_ip out of dpg #11207

Conversation

lolyu commented Jun 21, 2022 • edited Loading

Why I did it

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

lgtm-com bot commented Jun 21, 2022

lgtm-com bot commented Jul 5, 2022

lolyu commented Jul 5, 2022

azure-pipelines bot commented Jul 5, 2022

[minigraph][dualtor] Support parsing `soc_ip` out of dpg #11207

[minigraph][dualtor] Support parsing `soc_ip` out of dpg #11207

lolyu commented Jun 21, 2022 •

edited

Loading