Merge "* Dont create default qos queue, forwarding class and qos-config"

Juniper · Aug 3, 2016 · 089ea38 · 089ea38
2 parents 88ac12d + 98952ee
commit 089ea38
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/config/api-server/vnc_cfg_api_server.py b/src/config/api-server/vnc_cfg_api_server.py
@@ -1334,6 +1334,10 @@ def __init__(self, args_str=None):
         self.get_resource_class('routing-policy').generate_default_instance = False
         self.get_resource_class('route-aggregate').generate_default_instance = False
         self.get_resource_class('alarm').generate_default_instance = False
+        self.get_resource_class('qos-config').generate_default_instance = False
+        self.get_resource_class('qos-queue').generate_default_instance = False
+        self.get_resource_class('forwarding-class').generate_default_instance = False
+        self.get_resource_class('global-qos-config').generate_default_instance = False
 
         for act_res in _ACTION_RESOURCES:
             link = LinkObject('action', self._base_url, act_res['uri'],
@@ -2730,6 +2734,7 @@ def _db_init_entries(self):
             RoutingInstance('default-virtual-network',
                 routing_instance_is_default=True))
         self._create_singleton_entry(DiscoveryServiceAssignment())
+        self._create_singleton_entry(GlobalQosConfig())
 
         self._db_conn.db_resync()
         try: