NSXP LB: Change HM name attribute for consistency

Change-Id: Ia0cb8018bf5b6767f93977e861c2b0f718382fa3
This commit is contained in:
Kobi Samoray 2019-03-26 12:54:14 +02:00
parent 5e1d29093e
commit 06cbb8a83f
2 changed files with 24 additions and 24 deletions

View File

@ -1124,11 +1124,11 @@ class TestPolicyLBMonitorProfileHttpApi(test_resources.NsxPolicyLibTestCase):
"create_or_update") as api_call:
result = self.resourceApi.create_or_overwrite(
lb_monitor_profile_id=obj_id,
display_name=name,
name=name,
tenant=TEST_TENANT)
expected_def = self.obj_def(
lb_monitor_profile_id=obj_id,
display_name=name,
name=name,
tenant=TEST_TENANT)
self.assert_called_with_def(api_call, expected_def)
self.assertEqual(obj_id, result)
@ -1138,11 +1138,11 @@ class TestPolicyLBMonitorProfileHttpApi(test_resources.NsxPolicyLibTestCase):
with mock.patch.object(self.policy_api,
"create_or_update") as api_call:
result = self.resourceApi.create_or_overwrite(
display_name=name,
name=name,
tenant=TEST_TENANT)
expected_def = self.obj_def(
lb_monitor_profile_id=mock.ANY,
display_name=name,
name=name,
tenant=TEST_TENANT)
self.assert_called_with_def(api_call, expected_def)
self.assertIsNotNone(result)
@ -1193,11 +1193,11 @@ class TestPolicyLBMonitorProfileHttpApi(test_resources.NsxPolicyLibTestCase):
with mock.patch.object(self.policy_api,
"create_or_update") as update_call:
self.resourceApi.update(obj_id,
display_name=name,
name=name,
tenant=TEST_TENANT)
expected_def = self.obj_def(
lb_monitor_profile_id=obj_id,
display_name=name,
name=name,
tenant=TEST_TENANT)
self.assert_called_with_def(update_call, expected_def)

View File

@ -873,13 +873,13 @@ class NsxPolicyLBMonitorProfileBase(NsxPolicyResourceBase):
def update(self,
lb_monitor_profile_id,
display_name=IGNORE,
name=IGNORE,
tags=IGNORE,
tenant=constants.POLICY_INFRA_TENANT,
**kwargs):
self._update(
lb_monitor_profile_id=lb_monitor_profile_id,
display_name=display_name,
name=name,
tags=tags,
tenant=tenant,
**kwargs)
@ -897,7 +897,7 @@ class NsxPolicyLBMonitorProfileHttpApi(NsxPolicyLBMonitorProfileBase):
def create_or_overwrite(self,
lb_monitor_profile_id=None,
tags=IGNORE,
display_name=IGNORE,
name=IGNORE,
interval=IGNORE,
timeout=IGNORE,
fall_count=IGNORE,
@ -914,7 +914,7 @@ class NsxPolicyLBMonitorProfileHttpApi(NsxPolicyLBMonitorProfileBase):
self).create_or_overwrite(
lb_monitor_profile_id=lb_monitor_profile_id,
tags=tags,
display_name=display_name,
name=name,
interval=interval,
timeout=timeout,
fall_count=fall_count,
@ -931,7 +931,7 @@ class NsxPolicyLBMonitorProfileHttpApi(NsxPolicyLBMonitorProfileBase):
def update(self,
lb_monitor_profile_id,
tags=IGNORE,
display_name=IGNORE,
name=IGNORE,
interval=IGNORE,
timeout=IGNORE,
fall_count=IGNORE,
@ -947,7 +947,7 @@ class NsxPolicyLBMonitorProfileHttpApi(NsxPolicyLBMonitorProfileBase):
return super(NsxPolicyLBMonitorProfileHttpApi, self).update(
lb_monitor_profile_id=lb_monitor_profile_id,
tags=tags,
display_name=display_name,
name=name,
interval=interval,
timeout=timeout,
fall_count=fall_count,
@ -980,7 +980,7 @@ class NsxPolicyLBMonitorProfileUdpApi(NsxPolicyLBMonitorProfileBase):
def create_or_overwrite(self,
lb_monitor_profile_id=None,
tags=IGNORE,
display_name=IGNORE,
name=IGNORE,
interval=IGNORE,
timeout=IGNORE,
fall_count=IGNORE,
@ -993,7 +993,7 @@ class NsxPolicyLBMonitorProfileUdpApi(NsxPolicyLBMonitorProfileBase):
self).create_or_overwrite(
lb_monitor_profile_id=lb_monitor_profile_id,
tags=tags,
display_name=display_name,
name=name,
interval=interval,
timeout=timeout,
fall_count=fall_count,
@ -1006,7 +1006,7 @@ class NsxPolicyLBMonitorProfileUdpApi(NsxPolicyLBMonitorProfileBase):
def update(self,
lb_monitor_profile_id,
tags=IGNORE,
display_name=IGNORE,
name=IGNORE,
interval=IGNORE,
timeout=IGNORE,
fall_count=IGNORE,
@ -1018,7 +1018,7 @@ class NsxPolicyLBMonitorProfileUdpApi(NsxPolicyLBMonitorProfileBase):
return super(NsxPolicyLBMonitorProfileUdpApi, self).update(
lb_monitor_profile_id=lb_monitor_profile_id,
tags=tags,
display_name=display_name,
name=name,
interval=interval,
timeout=timeout,
fall_count=fall_count,
@ -1039,7 +1039,7 @@ class NsxPolicyLBMonitorProfileIcmpApi(NsxPolicyLBMonitorProfileBase):
def create_or_overwrite(self,
lb_monitor_profile_id=None,
tags=IGNORE,
display_name=IGNORE,
name=IGNORE,
interval=IGNORE,
timeout=IGNORE,
fall_count=IGNORE,
@ -1049,7 +1049,7 @@ class NsxPolicyLBMonitorProfileIcmpApi(NsxPolicyLBMonitorProfileBase):
self).create_or_overwrite(
lb_monitor_profile_id=lb_monitor_profile_id,
tags=tags,
display_name=display_name,
name=name,
interval=interval,
timeout=timeout,
fall_count=fall_count,
@ -1059,7 +1059,7 @@ class NsxPolicyLBMonitorProfileIcmpApi(NsxPolicyLBMonitorProfileBase):
def update(self,
lb_monitor_profile_id,
tags=IGNORE,
display_name=IGNORE,
name=IGNORE,
interval=IGNORE,
timeout=IGNORE,
fall_count=IGNORE,
@ -1068,7 +1068,7 @@ class NsxPolicyLBMonitorProfileIcmpApi(NsxPolicyLBMonitorProfileBase):
return super(NsxPolicyLBMonitorProfileIcmpApi, self).update(
lb_monitor_profile_id=lb_monitor_profile_id,
tags=tags,
display_name=display_name,
name=name,
interval=interval,
timeout=timeout,
fall_count=fall_count,
@ -1086,7 +1086,7 @@ class NsxPolicyLBMonitorProfileTcpApi(NsxPolicyLBMonitorProfileBase):
def create_or_overwrite(self,
lb_monitor_profile_id=None,
tags=IGNORE,
display_name=IGNORE,
name=IGNORE,
interval=IGNORE,
timeout=IGNORE,
fall_count=IGNORE,
@ -1097,7 +1097,7 @@ class NsxPolicyLBMonitorProfileTcpApi(NsxPolicyLBMonitorProfileBase):
self).create_or_overwrite(
lb_monitor_profile_id=lb_monitor_profile_id,
tags=tags,
display_name=display_name,
name=name,
interval=interval,
timeout=timeout,
fall_count=fall_count,
@ -1108,7 +1108,7 @@ class NsxPolicyLBMonitorProfileTcpApi(NsxPolicyLBMonitorProfileBase):
def update(self,
lb_monitor_profile_id,
tags=IGNORE,
display_name=IGNORE,
name=IGNORE,
interval=IGNORE,
timeout=IGNORE,
fall_count=IGNORE,
@ -1118,7 +1118,7 @@ class NsxPolicyLBMonitorProfileTcpApi(NsxPolicyLBMonitorProfileBase):
return super(NsxPolicyLBMonitorProfileTcpApi, self).update(
lb_monitor_profile_id=lb_monitor_profile_id,
tags=tags,
display_name=display_name,
name=name,
interval=interval,
timeout=timeout,
fall_count=fall_count,