x
/
group-based-policy-automation
Code Issues Proposed changes

Add network_id field for L2 Policy Heat Extensions. 

Change-Id: I743d22986e31b644bfaa6e5590ec29db11494627
(cherry picked from commit c4e1f574d6)
This commit is contained in:
Sayali Naval 2020-11-18 15:59:47 -08:00 committed by Sayali Vidyadhar Naval
parent 65f1c2f6cc
commit 7e0661a2d2
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gbpautomation/heat/engine/resources/grouppolicy.py
View File

@ -378,10 +378,11 @@ class PolicyTargetGroup(gbpresource.GBPResource):
class L2Policy(gbpresource.GBPResource):
PROPERTIES = (
TENANT_ID, NAME, DESCRIPTION, L3_POLICY_ID, SHARED, REUSE_BD
TENANT_ID, NAME, DESCRIPTION, L3_POLICY_ID,
SHARED, REUSE_BD, NETWORK_ID
) = (
'tenant_id', 'name', 'description', 'l3_policy_id', 'shared',
'reuse_bd'
'reuse_bd', 'network_id'
)
properties_schema = {
@ -414,6 +415,11 @@ class L2Policy(gbpresource.GBPResource):
properties.Schema.STRING,
_('Existing L2P ID in same L3P.'),
default=None, update_allowed=False
),
NETWORK_ID: properties.Schema(
properties.Schema.STRING,
_('Network ID of the L2 policy.'),
update_allowed=False
)
}

5
gbpautomation/heat/tests/test_grouppolicy.py
View File

@ -162,7 +162,8 @@ l2_policy_template = '''
"description": "test L2 policy resource",
"l3_policy_id": "l3-policy-id",
"shared": True,
"reuse_bd": "other-l2p"
"reuse_bd": "other-l2p",
"network_id": "network-id"
}
}
}
@ -875,6 +876,7 @@ class L2PolicyTest(HeatTestCase):
"l3_policy_id": "l3-policy-id",
"shared": True,
"reuse_bd": "other-l2p",
"network_id": "network-id",
}
}).AndReturn({'l2_policy': {'id': '5678'}})
@ -899,6 +901,7 @@ class L2PolicyTest(HeatTestCase):
"l3_policy_id": "l3-policy-id",
"shared": True,
"reuse_bd": "other-l2p",
"network_id": "network-id",
}
}).AndRaise(grouppolicy.NeutronClientException())
self.m.ReplayAll()