Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sonic-head.yang]: Removing duplicate definition and file for sonic-e… #64

Merged

Conversation

praveen-li
Copy link
Collaborator

…xtension.

Signed-off-by: Praveen Chaudhary [email protected]

- What I did
[sonic-head.yang]: Removing duplicate definition and file for sonic-extension.

- How I did it
[sonic-head.yang]: Removing duplicate definition and file for sonic-extension.

- How to verify it
Clean up testing:

All files were copied together as part of single PKG.

admin@lnos-x1-a-fab01:~/test_pc_load_yang$ ls -l /usr/local/yang-models/sonic*
-rw-r--r-- 1 root staff 5288 Apr  8 04:42 /usr/local/yang-models/sonic-acl.yang
-rw-r--r-- 1 root staff  650 Apr  8 04:42 /usr/local/yang-models/sonic-extension.yang
-rw-r--r-- 1 root staff 2409 Apr  8 04:42 /usr/local/yang-models/sonic-head.yang
-rw-r--r-- 1 root staff 2547 Apr  8 04:42 /usr/local/yang-models/sonic-interface.yang
-rw-r--r-- 1 root staff 3020 Apr  8 04:42 /usr/local/yang-models/sonic-loopback-interface.yang
-rw-r--r-- 1 root staff 1641 Apr  8 04:42 /usr/local/yang-models/sonic-portchannel.yang
-rw-r--r-- 1 root staff 1581 Apr  8 04:42 /usr/local/yang-models/sonic-port.yang
-rw-r--r-- 1 root staff 4260 Apr  8 04:42 /usr/local/yang-models/sonic-vlan.yang
-rw-r--r-- 1 root staff 5391 Apr  8 04:42 /usr/local/yang-models/sonic_yang_tree

Removed extra definition of sonic extension.

admin@lnos-x1-a-fab01:~/test_pc_load_yang$ tail -10 /usr/local/yang-models/sonic-head.yang
    }

    typedef vlan_tagging_mode {
        type enumeration {
            enum tagged;
            enum untagged;
            enum priority_tagged;
        }
    }
}

Run breakout:

admin@lnos-x1-a-fab01:~/test_pc_load_yang$ !35
sudo config interface breakout Ethernet4 4x25G -v -y

Running Breakout Mode : 2x50G
Target Breakout Mode : 4x25G

Ports to be deleted :
 {
    "Ethernet6": "50000",
    "Ethernet4": "50000"
}
Ports to be added :
 {
    "Ethernet6": "25000",
    "Ethernet7": "25000",
    "Ethernet4": "25000",
    "Ethernet5": "25000"
}   


After running Logic to limit the impact

Final list of ports to be deleted :
 {
    "Ethernet6": "50000",
    "Ethernet4": "50000"
}
Final list of ports to be added :
 {
    "Ethernet6": "25000",
    "Ethernet7": "25000",
    "Ethernet4": "25000",
    "Ethernet5": "25000"
}

Loaded below Yang Models
['sonic-acl', 'sonic-extension', 'sonic-head', 'sonic-interface', 'sonic-loopback-interface', 'sonic-port', 'sonic-portchannel', 'sonic-vlan']
Reading data from Redis configDb

Start Port Deletion
Find dependecies for port Ethernet6
Find dependecies for port Ethernet4
Deleting Port: Ethernet6
Deleting Port: Ethernet4
Data Validation successful
Generate Final Config to write in DB

Start Port Addition
Data Validation successful
Generate Final Config to write in DB
Writing in Config DB
Verify Port Deletion from Asic DB, Wait...
sudo redis-cli -n 1 hgetall "ASIC_STATE:SAI_OBJECT_TYPE_PORT:oid:0x100000000071f"
(empty list or set)
sudo redis-cli -n 1 hgetall "ASIC_STATE:SAI_OBJECT_TYPE_PORT:oid:0x10000000006f6"
(empty list or set)
Writing in Config DB
Breakout process got successfully completed.

- Description for the changelog

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

@praveen-li praveen-li requested a review from li-pingmao April 8, 2020 22:10
@praveen-li
Copy link
Collaborator Author

@li-pingmao : kindly review. Thx.

@praveen-li praveen-li merged commit 982a618 into zhenggen-xu:sonic-cfg-mgmt May 1, 2020
@praveen-li praveen-li deleted the clean_up_yang_models branch May 1, 2020 18:28
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Jun 29, 2020
…te submodules (sonic-net#4852)

* src/sonic-platform-common 75698a8...82bbeab (9):
  > [sfputil] Make SfpUtilHelper.get_physical_to_logical noexcept as in SfpUtilBase (sonic-net#96)
  > [sfp_base] Update return value documentation of channel-specific methods (sonic-net#98)
  > [sfp] Tweak key names of some transceiver info fields (sonic-net#97)
  > fix typo:  portconfig.ini to port_config.ini (zhenggen-xu#94)
  > [chassis_base] Add platform API support for system LED (zhenggen-xu#91)
  > Add PCIe check commad  (zhenggen-xu#64)
  > [sfputilbase.py] Don't try to print EEPROM sysfs file name if we failed to read from it (zhenggen-xu#81)                                                                                    
  > [sfputilbase | sfputilhelper] Add support of platform.json (zhenggen-xu#72)
  > [eeprom] Add try-except to catch the IOError (zhenggen-xu#85)

* src/sonic-platform-daemons 0f4fd83...abe115e (2):
  > [xcvrd] Tweak some transceiver info key names (zhenggen-xu#62)
  > [psud][thermalctld] Always get fan/PSU LED status from platform API to avoid status inconsistencies (zhenggen-xu#59)                                                                        

* src/sonic-utilities fd7781b...16a33f2 (9):
  > [config] Fix syntax error (sonic-net#966)
  > [config] Fix indentation level in _get_disabled_services_list() (sonic-net#965)
  > a4e64d1 [sonic_installer] Refactor sonic_installer code (sonic-net#953)
  > 90efd62 [Show | Command Reference] Add Port breakout Show Command (sonic-net#859)
  > [sfpshow][mock_state_db] Tweak key names of some transceiver info fields (sonic-net#958)
  > [show] Add missing verbose option to "show line" (sonic-net#961)
  > [filter-fdb] Check VLAN Presence When Filter FDB (sonic-net#957)
  > [master]fix sonic-net#4716 show ipv6 interfaces neighbor_ip is N/A issue (sonic-net#948)
  > Fix for command. show interface transceiver eeprom -d Ethernet (sonic-net#955)

Note: sonic-utilities update fixes sonic-net#4716
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Sep 15, 2020
Update the patform daemons with new commits 

commit e9628b6
    Merge pull request zhenggen-xu#64 from judyjoseph/multi_asic_ledd_xcvr
    * platform daemon (Xcvrd, Ledd) changes for multi asic platform
      * Updates in ledd daemon to use namespaces and get the namespace from selector object.
      * Updates to xcvrd daemon to use the asic_id in talking to the right DB.
      * Updated based on new sonic-py-common API's
      * Invoke initializeGlobalConfig() in the SfpUpdate/DomInfoUpdate processes as well.

commit 415b8c4
    [thermalctld] Optimize the thermal policy loop to make it execute every 60 seconds (zhenggen-xu#77)
    
commit 3d1f319
    Update FAN_INFO in psud to avoid inconsistant output of show platform psud and show platform fan (zhenggen-xu#81)
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Jan 16, 2021
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Aug 9, 2022
[master][sonic-linkmgrd] submodule updates

df51322 Longxiang Lyu   Fri May 6 10:01:46 2022 +0800   Add `ActiveActiveStateMachine` implementation (zhenggen-xu#64)
e721ceb Jing Zhang      Wed May 4 10:07:14 2022 -0700   Add doc for default route related changes  (zhenggen-xu#63)
7bb06fb Jing Zhang      Tue May 3 09:48:28 2022 -0700   Add Cli support to enable or disable default route related feature (zhenggen-xu#68)
e4b02cb Jing Zhang      Mon May 2 13:27:54 2022 -0700   Reset WaitActiveUp count before switching to active (zhenggen-xu#70)
212d960 Jing Zhang      Wed Apr 27 10:35:05 2022 -0700  lower log level to warning (zhenggen-xu#69)
48abc9e Jing Zhang      Thu Apr 14 16:50:04 2022 -0700  Add support to enable switchover time measurement (with link prober interval decreased to 10ms) feature  (zhenggen-xu#61)
c4858a6 Jing Zhang      Thu Apr 14 11:27:55 2022 -0700  Avoid proactively switching to `active` if default route is missing  (zhenggen-xu#62)

sign-off: Jing Zhang [email protected]
zhenggen-xu pushed a commit that referenced this pull request May 24, 2024
…ically (sonic-net#17418)

#### Why I did it
src/sonic-dbsyncd
```
* 68baf40 - (HEAD -> 202305, origin/202305) [lldp-syncd] Fix unexpected exception in snmp-subagent (#64) (18 hours ago) [Zhaohui Sun]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants