x/vmware-nsx
Code Issues Proposed changes

Merge "NSX-V: py35 compatibility"

Browse Source
This commit is contained in:
Zuul 2018-05-30 07:11:00 +00:00 committed by Gerrit Code Review
commit 6757ca41b4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmware_nsx/plugins/nsx_v/md_proxy.py
View File

@ -658,8 +658,8 @@ class NsxVMetadataProxyHandler(object):
# When shared proxy is configured, insert authentication string # When shared proxy is configured, insert authentication string
if cfg.CONF.nsxv.metadata_shared_secret: if cfg.CONF.nsxv.metadata_shared_secret:
signature = hmac.new( signature = hmac.new(
cfg.CONF.nsxv.metadata_shared_secret, bytearray(cfg.CONF.nsxv.metadata_shared_secret, 'ascii'),
edge_id, bytearray(edge_id, 'ascii'),
hashlib.sha256).hexdigest() hashlib.sha256).hexdigest()
sign_app_rule = nsxv_lb.NsxvLBAppRule( sign_app_rule = nsxv_lb.NsxvLBAppRule(
'insert-auth', 'insert-auth',

7
vmware_nsx/shell/admin/plugins/nsxv/resources/metadata.py
View File

@ -159,9 +159,10 @@ def update_shared_secret(resource, event, trigger, **kwargs):
virt.del_app_rule('insert-auth') virt.del_app_rule('insert-auth')
if cfg.CONF.nsxv.metadata_shared_secret: if cfg.CONF.nsxv.metadata_shared_secret:
signature = hmac.new(cfg.CONF.nsxv.metadata_shared_secret, signature = hmac.new(
edge_id, bytearray(cfg.CONF.nsxv.metadata_shared_secret, 'ascii'),
hashlib.sha256).hexdigest() bytearray(edge_id, 'ascii'),
hashlib.sha256).hexdigest()
sign = 'reqadd X-Metadata-Provider-Signature:' + signature sign = 'reqadd X-Metadata-Provider-Signature:' + signature
sign_app_rule = nsxv_lb.NsxvLBAppRule('insert-auth', sign) sign_app_rule = nsxv_lb.NsxvLBAppRule('insert-auth', sign)
virt.add_app_rule(sign_app_rule) virt.add_app_rule(sign_app_rule)