x/group-based-policy
Code Issues Proposed changes

[VMware] Adjust to enforcement point API change

Browse Source 
Enforcement point was modified to hold single connection.
In addition, to avoid requirements conflict, modify devstack
scripts to work against stable/ocata branch of vmware-nsxlib.

Change-Id: I4b889851d1aa0e142e5b95a696ccaa60fa4a8448
This commit is contained in:
Anna Khmelnitsky 2017-07-19 15:00:31 -07:00
parent 4fb6e00261
commit 00ef2c98de
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/lib/nsx
View File

@ -1,12 +1,11 @@
# TODO(annak): This is a temporary solution # TODO(annak): This is a temporary solution
# nsxlib, which wraps policy API, is under development # nsxlib, which wraps policy API, is under development
# since policy API is yet to be finalized # since policy API is yet to be finalized
# we prefer to run against master branch at this point
function prepare_nsx_policy { function prepare_nsx_policy {
NSXLIB_NAME='vmware-nsxlib' NSXLIB_NAME='vmware-nsxlib'
GITDIR[$NSXLIB_NAME]=/opt/stack/vmware-nsxlib GITDIR[$NSXLIB_NAME]=/opt/stack/vmware-nsxlib
GITREPO[$NSXLIB_NAME]=${NSXLIB_REPO:-${GIT_BASE}/openstack/vmware-nsxlib.git} GITREPO[$NSXLIB_NAME]=${NSXLIB_REPO:-${GIT_BASE}/openstack/vmware-nsxlib.git}
GITBRANCH[$NSXLIB_NAME]=${NSXLIB_BRANCH:-master} GITBRANCH[$NSXLIB_NAME]=${NSXLIB_BRANCH:-stable/ocata}
if use_library_from_git $NSXLIB_NAME; then if use_library_from_git $NSXLIB_NAME; then
git_clone_by_name $NSXLIB_NAME git_clone_by_name $NSXLIB_NAME

10
gbpservice/neutron/services/grouppolicy/drivers/vmware/nsx_policy/nsx_policy_mapping.py
View File

@ -129,11 +129,11 @@ class NsxPolicyMappingDriver(api.ResourceMappingDriver):
nsx_manager_thumbprint = cfg.CONF.NSX_POLICY.nsx_manager_thumbprint nsx_manager_thumbprint = cfg.CONF.NSX_POLICY.nsx_manager_thumbprint
epoints = self.nsx_policy.enforcement_point.list() epoints = self.nsx_policy.enforcement_point.list()
for ep in epoints: for ep in epoints:
for conn in ep['connection_info']: conn = ep['connection_info']
if conn['enforcement_point_address'] == nsx_manager_ip: if conn and conn['enforcement_point_address'] == nsx_manager_ip:
LOG.debug('Enforcement point for %s already exists (%s)', LOG.debug('Enforcement point for %s already exists (%s)',
nsx_manager_ip, ep['id']) nsx_manager_ip, ep['id'])
return return
LOG.info('Creating enforcement point for %s', nsx_manager_ip) LOG.info('Creating enforcement point for %s', nsx_manager_ip)
self.nsx_policy.enforcement_point.create_or_overwrite( self.nsx_policy.enforcement_point.create_or_overwrite(