[CORD-2887] Adding config for vsg-hw and dependency to onos-fabric, removed addressmanager
Change-Id: Ie03f96ae27d379caf6e9661a3b00be391cef1c10
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 5f2b6e6..403884d 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -83,7 +83,7 @@
maxBytes: 10485760
backupCount: 5
loggers:
- '':
+ 'multistructlog':
handlers:
- console
- file
diff --git a/xos-profiles/rcord-lite/requirements.yaml b/xos-profiles/rcord-lite/requirements.yaml
index ff949b5..31551dc 100644
--- a/xos-profiles/rcord-lite/requirements.yaml
+++ b/xos-profiles/rcord-lite/requirements.yaml
@@ -18,9 +18,6 @@
- name: onos-service
version: 0.1.0
repository: file://../../xos-services/onos-service
-- name: addressmanager
- version: 0.1.0
- repository: file://../../xos-services/addressmanager
- name: fabric
version: 0.1.0
repository: file://../../xos-services/fabric
diff --git a/xos-profiles/rcord-lite/values.yaml b/xos-profiles/rcord-lite/values.yaml
index 3a4974f..49084b6 100644
--- a/xos-profiles/rcord-lite/values.yaml
+++ b/xos-profiles/rcord-lite/values.yaml
@@ -39,11 +39,6 @@
xosAdminPassword: letmein
# Service-specific configuration.
-addressmanager:
- serviceConfig:
- accessor:
- username: admin@opencord.org
- password: letmein
fabric:
serviceConfig:
accessor:
@@ -192,7 +187,8 @@
name: ONOS_Fabric
kind: platform
no_container: true
- rest_hostname: onos-fabric
+ rest_hostname: onos-fabric-ui
+ rest_port: 8181
serviceattribute#fabric_network_cfg_json:
type: tosca.nodes.ServiceAttribute
requirements:
@@ -230,8 +226,6 @@
tosca_definitions_version: tosca_simple_yaml_1_0
description: Set up VOLT, AddressManager, and RCORD services
imports:
- - custom_types/addressmanagerservice.yaml
- - custom_types/addresspool.yaml
- custom_types/image.yaml
- custom_types/network.yaml
- custom_types/networkslice.yaml
@@ -249,6 +243,11 @@
- custom_types/vsghwservice.yaml
topology_template:
node_templates:
+ service#ONOS_Fabric:
+ type: tosca.nodes.ONOSService
+ properties:
+ name: ONOS_Fabric
+ must-exist: true
service#rcord:
type: tosca.nodes.Service
properties:
@@ -273,10 +272,6 @@
type: tosca.nodes.VSGHWService
properties:
name: vsg-hw
- service#addressmanager:
- type: tosca.nodes.AddressManagerService
- properties:
- name: addressmanager
volt_vsg-hw:
type: tosca.nodes.ServiceDependency
properties:
@@ -288,7 +283,7 @@
- provider_service:
node: service#vsg-hw
relationship: tosca.relationships.BelongsToOne
- vsg-hw_addressmanager:
+ onos_fabric_vsg-hw:
type: tosca.nodes.ServiceDependency
properties:
connect_method: None
@@ -297,7 +292,7 @@
node: service#vsg-hw
relationship: tosca.relationships.BelongsToOne
- provider_service:
- node: service#addressmanager
+ node: service#ONOS_Fabric
relationship: tosca.relationships.BelongsToOne
serviceGraphConstraints:
@@ -310,4 +305,4 @@
constraints:
type: tosca.nodes.ServiceGraphConstraint
properties:
- constraints: '[[null, "rcord"], [null, "volt"], ["addressmanager", "vsg-hw"]]'
+ constraints: '[[null, "rcord"], [null, "volt"], ["ONOS_Fabric", "vsg-hw"]]'
diff --git a/xos-services/fabric/values.yaml b/xos-services/fabric/values.yaml
index 78e8303..ec2e3d6 100644
--- a/xos-services/fabric/values.yaml
+++ b/xos-services/fabric/values.yaml
@@ -53,4 +53,20 @@
steps_dir: "/opt/xos/synchronizers/fabric/steps"
sys_dir: "/opt/xos/synchronizers/fabric/sys"
models_dir: "/opt/xos/synchronizers/fabric/models"
+ logging:
+ version: 1
+ handlers:
+ console:
+ class: logging.StreamHandler
+ file:
+ class: logging.handlers.RotatingFileHandler
+ filename: /var/log/xos.log
+ maxBytes: 10485760
+ backupCount: 5
+ loggers:
+ 'multistructlog':
+ handlers:
+ - console
+ - file
+ level: DEBUG
diff --git a/xos-services/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index 28fc6d4..9a81457 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -48,3 +48,19 @@
steps_dir: "/opt/xos/synchronizers/onos/steps"
sys_dir: "/opt/xos/synchronizers/onos/sys"
models_dir: "/opt/xos/synchronizers/onos/models"
+ logging:
+ version: 1
+ handlers:
+ console:
+ class: logging.StreamHandler
+ file:
+ class: logging.handlers.RotatingFileHandler
+ filename: /var/log/xos.log
+ maxBytes: 10485760
+ backupCount: 5
+ loggers:
+ 'multistructlog':
+ handlers:
+ - console
+ - file
+ level: DEBUG
diff --git a/xos-services/vsg-hw/values.yaml b/xos-services/vsg-hw/values.yaml
index 12b3f69..7f23fe3 100644
--- a/xos-services/vsg-hw/values.yaml
+++ b/xos-services/vsg-hw/values.yaml
@@ -53,3 +53,19 @@
model_policies_dir: "/opt/xos/synchronizers/vsg-hw/model_policies"
sys_dir: "/opt/xos/synchronizers/vsg-hw/sys"
models_dir: "/opt/xos/synchronizers/vsg-hw/models"
+ logging:
+ version: 1
+ handlers:
+ console:
+ class: logging.StreamHandler
+ file:
+ class: logging.handlers.RotatingFileHandler
+ filename: /var/log/xos.log
+ maxBytes: 10485760
+ backupCount: 5
+ loggers:
+ 'multistructlog':
+ handlers:
+ - console
+ - file
+ level: DEBUG