diff options
| author | hagbard <vyosdev@derith.de> | 2019-12-16 08:56:46 -0800 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2019-12-16 08:56:46 -0800 |
| commit | 214e63fbad5f1ed008543ba0eec56d1aa6649745 (patch) | |
| tree | 71f21947a57366cf007206b0b852411ed09afb0e /python/vyos | |
| parent | d814020778b8310faa3cd57ccfbc718bfb2fe215 (diff) | |
| parent | b55b68f6246329468b4ab3450e127d5bab683bff (diff) | |
| download | vyos-1x-214e63fbad5f1ed008543ba0eec56d1aa6649745.tar.gz vyos-1x-214e63fbad5f1ed008543ba0eec56d1aa6649745.zip | |
Merge branch 'current' into equuleus
Diffstat (limited to 'python/vyos')
| -rw-r--r-- | python/vyos/config.py | 2 | ||||
| -rw-r--r-- | python/vyos/configdict.py | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/python/vyos/config.py b/python/vyos/config.py index 8bf5a1727..6aed8693c 100644 --- a/python/vyos/config.py +++ b/python/vyos/config.py @@ -99,7 +99,7 @@ class Config(object): # Running config can be obtained either from op or conf mode, it always succeeds # (if config system is initialized at all). if os.path.isfile('/tmp/vyos-config-status'): - running_config_text = self._run([self._cli_shell_api, '--show-active-only', '--show-show-defaults', 'showConfig']) + running_config_text = self._run([self._cli_shell_api, '--show-active-only', '--show-show-defaults', '--show-ignore-edit', 'showConfig']) else: with open('/opt/vyatta/etc/config/config.boot') as f: running_config_text = f.read() diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py index e8e52b33d..7f5ae3db9 100644 --- a/python/vyos/configdict.py +++ b/python/vyos/configdict.py @@ -179,16 +179,18 @@ def vlan_to_dict(conf): vlan['egress_qos'] = conf.return_value('egress-qos') # egress changes QoS require VLAN interface recreation - if vlan['egress_qos'] != conf.return_effective_value('egress-qos'): - vlan['egress_qos_changed'] = True + if conf.return_effective_value('egress-qos'): + if vlan['egress_qos'] != conf.return_effective_value('egress-qos'): + vlan['egress_qos_changed'] = True # VLAN ingress QoS if conf.exists('ingress-qos'): vlan['ingress_qos'] = conf.return_value('ingress-qos') # ingress changes QoS require VLAN interface recreation - if vlan['ingress_qos'] != conf.return_effective_value('ingress-qos'): - vlan['ingress_qos_changed'] = True + if conf.return_effective_value('ingress-qos'): + if vlan['ingress_qos'] != conf.return_effective_value('ingress-qos'): + vlan['ingress_qos_changed'] = True # ethertype is mandatory on vif-s nodes and only exists here! # check if this is a vif-s node at all: |