Merge "Remove resource_server.py as it is not used any more"

src/config/api-server/SConscript

@@ -33,7 +33,6 @@ generated_files = [
                   'vnc_cfg_api_server/gen/__init__.py',
                   'vnc_cfg_api_server/gen/resource_xsd.py',
                   'vnc_cfg_api_server/gen/resource_common.py',
-                  'vnc_cfg_api_server/gen/resource_server.py',
                   'vnc_cfg_api_server/gen/resource_test.py',
                   'vnc_cfg_api_server/gen/vnc_api_server_gen.py',
                   'vnc_cfg_api_server/gen/vnc_ifmap_client_gen.py',

src/config/api-server/vnc_cfg_api_server.py

@@ -74,7 +74,6 @@
 from vnc_quota import *
 from gen.resource_xsd import *
 from gen.resource_common import *
-from gen.resource_server import *
 import gen.vnc_api_server_gen
 import cfgm_common
 from cfgm_common.utils import cgitb_hook

src/config/api-server/vnc_cfg_types.py

@@ -2,10 +2,9 @@
 # Copyright (c) 2013 Juniper Networks, Inc. All rights reserved.
 #
 #
-# This file is built up from an autogenerated template resource_server.py and
-# contains code/hooks at different point during processing a request, specific
-# to type of resource. For eg. allocation of mac/ip-addr for a port during its
-# creation.
+# This file contains code/hooks at different point during processing a request,
+# specific to type of resource. For eg. allocation of mac/ip-addr for a port
+# during its creation.
 import copy
 from cfgm_common import jsonutils as json
 import re
@@ -22,7 +21,6 @@
 from context import get_context
 from gen.resource_xsd import *
 from gen.resource_common import *
-from gen.resource_server import *
 from netaddr import IPNetwork
 from pprint import pformat
 from pysandesh.gen_py.sandesh.ttypes import SandeshLevel

src/config/api-server/vnc_quota.py

@@ -1,6 +1,5 @@
 from gen.resource_xsd import *
 from gen.resource_common import *
-from gen.resource_server import *
 from pprint import pformat
 import cfgm_common.exceptions