Skip to content

Commit

Permalink
Changes for UVE for contrail-vcenter-manager
Browse files Browse the repository at this point in the history
Change-Id: I6013a1f8ff2a219ee4fd5d948181cb178f846618
Closes-Bug: #1780141
  • Loading branch information
krzysztofg256 authored and aszc-dev committed Jul 12, 2018
1 parent e1f7474 commit 93b491b
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/sandesh/common/vns.sandesh
Expand Up @@ -38,6 +38,7 @@ const string SERVICE_IFMAP_SERVER = "ifmap"
const string SERVICE_KAFKA = "kafka"
const string SERVICE_IRONIC_NOTIF_MANAGER = "ironic-notification-manager"
const string SERVICE_FABRIC_ANSIBLE = "contrail-fabric-ansible"
const string SERVICE_VCENTER_MANAGER = "contrail-vcenter-manager"

// NodeMgr names
const string SERVICE_COMPUTE_NODE_MGR = "contrail-vrouter-nodemgr"
Expand All @@ -61,6 +62,7 @@ const u16 HttpPortMesosManager = 8109
const u16 HttpPortIronicNotifManager = 8110
const u16 HttpPortFabricAnsible = 8111
const u16 HttpPortConfigDatabaseNodemgr = 8112
const u16 HttpPortvCenterManager = 9090

const u16 HttpPortControl = 8083
const u16 HttpPortApiServer = 8084
Expand Down Expand Up @@ -143,6 +145,7 @@ const map<string, u16> ServiceHttpPortMap = {
SERVICE_MESOS_MANAGER: HttpPortMesosManager,
SERVICE_IRONIC_NOTIF_MANAGER: HttpPortIronicNotifManager,
SERVICE_FABRIC_ANSIBLE: HttpPortFabricAnsible,
SERVICE_VCENTER_MANAGER: HttpPortvCenterManager,
}

const list<string> NodeUVEImplementedServices = [
Expand Down Expand Up @@ -171,6 +174,7 @@ const list<string> NodeUVEImplementedServices = [
SERVICE_DISCOVERY_0,
SERVICE_KUBE_MANAGER,
SERVICE_MESOS_MANAGER,
SERVICE_VCENTER_MANAGER,
]

const list<string> BackupImplementedServices = [
Expand Down Expand Up @@ -212,6 +216,7 @@ const map<string, list<string> > ServicesDefaultConfigurationFiles = {
SERVICE_DNSD : ['/etc/contrail/dns.conf'],
SERVICE_KUBE_MANAGER : ['/etc/contrail/contrail-kubernetes.conf'],
SERVICE_MESOS_MANAGER : ['/etc/contrail/contrail-mesos.conf'],
SERVICE_VCENTER_MANAGER: ['/etc/contrail/contrail-vcenter-manager/config.yaml'],
}

enum Module {
Expand Down Expand Up @@ -248,6 +253,7 @@ enum Module {
IRONIC_NOTIF_MANAGER,
FABRIC_ANSIBLE,
CONFIG_DATABASE_NODE_MGR,
VCENTER_MANAGER,
}

enum VrouterAgentType {
Expand Down Expand Up @@ -334,6 +340,7 @@ const string MODULE_KUBE_MANAGER_NAME = SERVICE_KUBE_MANAGER
const string MODULE_MESOS_MANAGER_NAME = SERVICE_MESOS_MANAGER
const string MODULE_IRONIC_NOTIF_MANAGER_NAME = SERVICE_IRONIC_NOTIF_MANAGER
const string MODULE_FABRIC_ANSIBLE_NAME = "FabricAnsible"
const string MODULE_VCENTER_MANAGER_NAME = SERVICE_VCENTER_MANAGER

const map<Module, string> ModuleNames = {
Module.CONTROL_NODE : MODULE_CONTROL_NODE_NAME,
Expand Down Expand Up @@ -368,6 +375,7 @@ const map<Module, string> ModuleNames = {
Module.MESOS_MANAGER : MODULE_MESOS_MANAGER_NAME,
Module.IRONIC_NOTIF_MANAGER : MODULE_IRONIC_NOTIF_MANAGER_NAME,
Module.FABRIC_ANSIBLE : MODULE_FABRIC_ANSIBLE_NAME,
Module.VCENTER_MANAGER : MODULE_VCENTER_MANAGER_NAME,
}

const map<string, Module> ModuleIds = {
Expand Down Expand Up @@ -403,6 +411,7 @@ const map<string, Module> ModuleIds = {
MODULE_MESOS_MANAGER_NAME : Module.MESOS_MANAGER,
MODULE_IRONIC_NOTIF_MANAGER_NAME : Module.IRONIC_NOTIF_MANAGER,
MODULE_FABRIC_ANSIBLE_NAME : Module.FABRIC_ANSIBLE,
MODULE_VCENTER_MANAGER_NAME : Module.VCENTER_MANAGER,
}


Expand Down Expand Up @@ -488,6 +497,7 @@ const map <Module, NodeType> Module2NodeType = {
Module.MESOS_MANAGER : NodeType.CONFIG,
Module.FABRIC_ANSIBLE : NodeType.CONFIG,
Module.IRONIC_NOTIF_MANAGER : NodeType.CONFIG,
Module.VCENTER_MANAGER : NodeType.COMPUTE,
}

const string INSTANCE_ID_DEFAULT = "0"
Expand Down Expand Up @@ -585,6 +595,8 @@ const map<Module, list<Category>> ModuleCategoryMap = {
],
Module.MESOS_MANAGER : [Category.DEFAULT,
],
Module.VCENTER_MANAGER : [Category.DEFAULT
],
}

const string COLLECTOR_DISCOVERY_SERVICE_NAME = "Collector"
Expand Down

0 comments on commit 93b491b

Please sign in to comment.