Merge "Change resource type for LB resources"

This commit is contained in:
Jenkins 2017-05-28 17:50:48 +00:00 committed by Gerrit Code Review
commit ae4ca078d6
2 changed files with 14 additions and 14 deletions

View File

@ -201,7 +201,7 @@ FAKE_IP_SET = {
FAKE_APPLICATION_PROFILE_UUID = uuidutils.generate_uuid()
FAKE_APPLICATION_PROFILE = {
"resource_type": "LoadBalancerHttpProfile",
"resource_type": "LbHttpProfile",
"description": "my http profile",
"id": FAKE_APPLICATION_PROFILE_UUID,
"display_name": "httpprofile1",
@ -220,7 +220,7 @@ FAKE_APPLICATION_PROFILE = {
FAKE_PERSISTENCE_PROFILE_UUID = uuidutils.generate_uuid()
FAKE_PERSISTENCE_PROFILE = {
"resource_type": "LoadBalancerCookiePersistenceProfile",
"resource_type": "LbCookiePersistenceProfile",
"description": "cookie persistence",
"id": FAKE_PERSISTENCE_PROFILE_UUID,
"display_name": "cookiePersistence",
@ -259,7 +259,7 @@ FAKE_MONITOR = {
"display_name": "httpmonitor1",
"description": "my http monitor",
"id": FAKE_MONITOR_UUID,
"resource_type": "LoadBalancerHttpMonitor",
"resource_type": "LbHttpMonitor",
"interval": 5,
"rise_count": 3,
"fall_count": 3,

View File

@ -20,27 +20,27 @@ from vmware_nsxlib.v3 import utils
class ApplicationProfileTypes(object):
"""LoadBalancer Application Profile types"""
HTTP = "LoadBalancerHttpProfile"
FAST_TCP = "LoadBalancerFastTcpProfile"
FAST_UDP = "LoadBalancerFastUdpProfile"
HTTP = "LbHttpProfile"
FAST_TCP = "LbFastTcpProfile"
FAST_UDP = "LbFastUdpProfile"
class PersistenceProfileTypes(object):
"""LoadBalancer Persistence Profile types"""
COOKIE = "LoadBalancerCookiePersistenceProfile"
SOURCE_IP = "LoadBalancerSourceIpPersistenceProfile"
COOKIE = "LbCookiePersistenceProfile"
SOURCE_IP = "LbSourceIpPersistenceProfile"
class MonitorTypes(object):
"""LoadBalancer Monitor types"""
HTTP = "LoadBalancerHttpMonitor"
HTTPS = "LoadBalancerHttpsMonitor"
ICMP = "LoadBalancerIcmpMonitor"
PASSIVE = "LoadBalancerPassiveMonitor"
TCP = "LoadBalancerTcpMonitor"
UDP = "LoadBalancerUdpMonitor"
HTTP = "LbHttpMonitor"
HTTPS = "LbHttpsMonitor"
ICMP = "LbIcmpMonitor"
PASSIVE = "LbPassiveMonitor"
TCP = "LbTcpMonitor"
UDP = "LbUdpMonitor"
class LoadBalancerBase(utils.NsxLibApiBase):