From b58699ae4e2af5c8583a4220073d44b23e595b45 Mon Sep 17 00:00:00 2001
From: Sachin Bansal <sachin@contrailsystems.com>
Date: Mon, 7 Dec 2015 15:01:31 -0800
Subject: [PATCH] Newly added arguments should be parsed as integers

Also fixed reaction map
Change-Id: I0411d442657270d5429b3efcdc1f13cf60836db2
Related-Bug: 1518047
---
 src/config/schema-transformer/config_db.py |  2 +-
 src/config/schema-transformer/to_bgp.py    | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/config/schema-transformer/config_db.py b/src/config/schema-transformer/config_db.py
index 6c378bfe29f..7451bf8263a 100644
--- a/src/config/schema-transformer/config_db.py
+++ b/src/config/schema-transformer/config_db.py
@@ -2789,7 +2789,7 @@ def delete_obj(self):
         self.update_single_ref('logical_router', {})
         self.update_multiple_refs('instance_ip', {})
         self.update_multiple_refs('floating_ip', {})
-        self.update_multiple_refs('bgp_as_a_service', {})
+        self.update_single_ref('bgp_as_a_service', {})
         self.update_routing_instances([])
     # end delete_obj
 
diff --git a/src/config/schema-transformer/to_bgp.py b/src/config/schema-transformer/to_bgp.py
index 9cd683f7dc0..035b699f7e3 100644
--- a/src/config/schema-transformer/to_bgp.py
+++ b/src/config/schema-transformer/to_bgp.py
@@ -115,10 +115,11 @@ class SchemaTransformer(object):
         },
         'bgp_as_a_service': {
             'self': ['bgp_router'],
-            'virtual_machine)interface': ['bgp_router']
+            'virtual_machine_interface': ['bgp_router']
         },
         'bgp_router': {
             'self': [],
+            'bgp_as_a_service': [],
         },
         'global_system_config': {
             'self': [],
@@ -610,8 +611,8 @@ def parse_args(args_str):
         'logging_conf': '',
         'logger_class': None,
         'sandesh_send_rate_limit': SandeshSystem.get_sandesh_send_rate_limit(),
-        'bgpaas_port_start': '50000',
-        'bgpaas_port_end': '50256',
+        'bgpaas_port_start': 50000,
+        'bgpaas_port_end': 50256,
     }
     secopts = {
         'use_certs': False,
@@ -724,9 +725,9 @@ def parse_args(args_str):
     parser.add_argument("--rabbit_password", help="password for rabbit")
     parser.add_argument("--rabbit_ha_mode", action='store_true',
         help="True if the rabbitmq cluster is mirroring all queue")
-    parser.add_argument("--bgpaas_port_start",
+    parser.add_argument("--bgpaas_port_start", type=int,
                         help="Start port for bgp-as-a-service proxy")
-    parser.add_argument("--bgpaas_port_end",
+    parser.add_argument("--bgpaas_port_end", type=int,
                         help="End port for bgp-as-a-service proxy")
 
     args = parser.parse_args(remaining_argv)