[cfg engine] Add support to read device description xml by taoyl-ms · Pull Request #775 · sonic-net/sonic-buildimage

taoyl-ms · 2017-06-30T01:24:36Z

No description provided.

qiluo-msft · 2017-07-01T00:49:00Z

src/sonic-config-engine/minigraph.py

+            name = node.text
+        elif node.tag == str(QName(ns, "HwSku")):
+            hwsku = node.text
+    return (lo_prefix, mgmt_prefix, name, hwsku, d_type)


name [](start = 36, length = 4)

name may be not itialized. #Closed

Fixed.

In reply to: 125150495 [](ancestors = 125150495)

qiluo-msft · 2017-07-01T00:52:10Z

src/sonic-config-engine/minigraph.py

        return json.JSONEncoder.default(self, obj)

+def parse_device(device):
+    lo_prefix = None


None [](start = 16, length = 4)

suggest init as empty string, so later conditional split can be simplified. #ByDesign

Let's keep it None as returning an empty string might make template debug mroe difficult than None.

In reply to: 125150571 [](ancestors = 125150571)

qiluo-msft · 2017-07-01T00:55:00Z

src/sonic-config-engine/minigraph.py

+    (lo_prefix, mgmt_prefix, hostname, hwsku, d_type) = parse_device(root)
+
+    Tree = lambda: defaultdict(Tree)
+    results = Tree()


results = {} ? #Closed

Fixed.

In reply to: 125150653 [](ancestors = 125150653)

qiluo-msft · 2017-07-01T00:56:42Z

src/sonic-config-engine/minigraph.py

+    results['inventory_hostname'] = hostname
+
+    lo_intfs = []
+    ipn = ipaddress.IPNetwork(lo_prefix)


lo_prefix [](start = 30, length = 9)

handle exception? #WontFix

I'm feeling letting the exception to be thrown out and crashing at the outermost layer is the best behavior if exception happens here.

In reply to: 125150698 [](ancestors = 125150698)

qiluo-msft · 2017-07-01T00:58:40Z

src/sonic-config-engine/minigraph.py

+    results['minigraph_lo_interfaces'] = lo_intfs
+
+    mgmt_intf = None
+    mgmtipn = ipaddress.IPNetwork(mgmt_prefix)


mgmtipn [](start = 4, length = 7)

mgmt_ipn? #Closed

Fixed.

In reply to: 125150747 [](ancestors = 125150747)

qiluo-msft · 2017-07-01T01:01:40Z

src/sonic-config-engine/sonic-cfggen

 def main():
    parser=argparse.ArgumentParser(description="Render configuration file from minigraph data and jinja2 template.")
-    parser.add_argument("-m", "--minigraph", help="minigraph xml file")
+    group = parser.add_mutually_exclusive_group()


() [](start = 47, length = 2)

If one is required, you may use 'required=True' #Closed

No, it's not true that one of them is required.

In reply to: 125150833 [](ancestors = 125150833)

qiluo-msft · 2017-07-01T01:02:46Z

Reformat it so human can read it? #Closed

Refers to: src/sonic-config-engine/tests/device.xml:2 in 7a81ec0. [](commit_id = 7a81ec0, deletion_comment = False)

taoyl-ms · 2017-07-03T23:31:18Z

Fixed.

In reply to: 312401152 [](ancestors = 312401152)

Refers to: src/sonic-config-engine/tests/device.xml:2 in 7a81ec0. [](commit_id = 7a81ec0, deletion_comment = False)

lguohan · 2017-07-06T17:01:37Z

src/sonic-config-engine/sonic-cfggen

-    parser.add_argument("-m", "--minigraph", help="minigraph xml file")
+    group = parser.add_mutually_exclusive_group()
+    group.add_argument("-m", "--minigraph", help="minigraph xml file")
+    group.add_argument("-M", "--device-description", help="device description xml file")


group.add_argument("-M", "--device-description", help="device description xml file") [](start = 1, length = 87)

instead of adding a new option, can we treat the device xml as a variant(subset) of minigraph which only contains a subset of information?

Don't see your point. Those are different files with different schema. I already make the output format consistence so you can use same tool and same template to generate, for example, interfaces file.

* 20b9573 2021-01-24 | [SAI]: update SAI submodule (sonic-net#775) (HEAD, origin/master, origin/HEAD) [lguohan] * 667c33d 2021-01-22 | [syncd] Comparison logic add support to LABEL attribute with higher priority (sonic-net#764) [Kamil Cudnik] * aaf5b98 2021-01-22 | [vslib]: Fix missing MACsec Create Port action (sonic-net#770) [Ze Gan] Signed-off-by: Guohan Lu <[email protected]>

* 20b9573 2021-01-24 | [SAI]: update SAI submodule (#775) (HEAD, origin/master, origin/HEAD) [lguohan] * 667c33d 2021-01-22 | [syncd] Comparison logic add support to LABEL attribute with higher priority (#764) [Kamil Cudnik] * aaf5b98 2021-01-22 | [vslib]: Fix missing MACsec Create Port action (#770) [Ze Gan] Signed-off-by: Guohan Lu <[email protected]>

* c0bdac2 2021-01-24 | [saithrift]: add correct libs to build saithrift on libsaivs (sonic-net#1184) (HEAD, origin/v1.7) [lguohan] Signed-off-by: Guohan Lu <[email protected]>

… automatically (sonic-net#775) #### Why I did it src/sonic-platform-common ``` * 91a2b87 - (HEAD -> 202405, origin/202405) Restore optoe page to default 0 for active cables (sonic-net#549) (sonic-net#47) (20 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog

[cfg engine] Add support to read device description xml

7a81ec0

taoyl-ms requested a review from lguohan June 30, 2017 01:24

msftclas added the cla-not-required label Jun 30, 2017

qiluo-msft reviewed Jul 1, 2017

View reviewed changes

Resolve CR comments

4813572

stcheng added the Enhancement ➕ label Jul 6, 2017

lguohan reviewed Jul 6, 2017

View reviewed changes

lguohan approved these changes Jul 6, 2017

View reviewed changes

taoyl-ms merged commit 90f21d4 into sonic-net:master Jul 6, 2017

lguohan mentioned this pull request Jan 24, 2021

[submodule]: update sonic-sairedis #6544

Merged

4 tasks

Conversation

taoyl-ms commented Jun 30, 2017

Uh oh!

qiluo-msft Jul 1, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

taoyl-ms Jul 3, 2017

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Jul 1, 2017 • edited by taoyl-ms Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

taoyl-ms Jul 3, 2017

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Jul 1, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

taoyl-ms Jul 3, 2017

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Jul 1, 2017 • edited by taoyl-ms Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

taoyl-ms Jul 3, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Jul 1, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

taoyl-ms Jul 3, 2017

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Jul 1, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

taoyl-ms Jul 3, 2017

Choose a reason for hiding this comment

Uh oh!

qiluo-msft commented Jul 1, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

taoyl-ms commented Jul 3, 2017

Uh oh!

lguohan Jul 6, 2017

Choose a reason for hiding this comment

Uh oh!

taoyl-ms Jul 6, 2017

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

qiluo-msft Jul 1, 2017 •

edited

Loading

qiluo-msft Jul 1, 2017 •

edited by taoyl-ms

Loading

qiluo-msft Jul 1, 2017 •

edited

Loading

qiluo-msft Jul 1, 2017 •

edited by taoyl-ms

Loading

taoyl-ms Jul 3, 2017 •

edited

Loading

qiluo-msft Jul 1, 2017 •

edited

Loading

qiluo-msft Jul 1, 2017 •

edited

Loading

qiluo-msft commented Jul 1, 2017 •

edited

Loading