Merge "Resource Resolution Service : 2"

2 files changed, 173 insertions, 173 deletions

diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt
index 102e2ebd3..4c2d6e2fc 100644
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt
+++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt
@@ -1,172 +1,172 @@
-/*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- *

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *     http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-package org.onap.ccsdk.apps.controllerblueprints.core

-

-/**

- * BluePrintConstants

- *

- * @author Brinda Santh

- */

-object BluePrintConstants {

-

-    const val RESPONSE_HEADER_TRANSACTION_ID: String = "X-ONAP-RequestID"

-    const val RESPONSE_HEADER_MINOR_VERSION: String = "X-MinorVersion"

-    const val RESPONSE_HEADER_PATCH_VERSION: String = "X-PatchVersion"

-    const val RESPONSE_HEADER_LATEST_VERSION: String = "X-LatestVersion"

-

-    const val STATUS_SUCCESS: String = "success"

-    const val STATUS_FAILURE: String = "failure"

-

-    const val TYPE_DEFAULT: String = "default"

-

-    const val DATA_TYPE_STRING: String = "string"

-    const val DATA_TYPE_INTEGER: String = "integer"

-    const val DATA_TYPE_FLOAT: String = "float"

-    const val DATA_TYPE_BOOLEAN: String = "boolean"

-    const val DATA_TYPE_TIMESTAMP: String = "timestamp"

-    const val DATA_TYPE_NULL: String = "null"

-    const val DATA_TYPE_LIST: String = "list"

-    const val DATA_TYPE_MAP: String = "map"

-

-    const val USER_SYSTEM: String = "System"

-

-    const val PATH_DIVIDER: String = "/"

-    const val PATH_SERVICE_TEMPLATE: String = "service_template"

-    const val PATH_TOPOLOGY_TEMPLATE: String = "topology_template"

-    const val PATH_METADATA: String = "metadata"

-    const val PATH_NODE_TYPES: String = "node_types"

-    const val PATH_POLICY_TYPES: String = "policy_types"

-    const val PATH_RELATIONSHIP_TYPES: String = "relationship_types"

-    const val PATH_ARTIFACT_TYPES: String = "artifact_types"

-    const val PATH_DATA_TYPES: String = "data_types"

-    const val PATH_INPUTS: String = "inputs"

-    const val PATH_NODE_WORKFLOWS: String = "workflows"

-    const val PATH_NODE_TEMPLATES: String = "node_templates"

-    const val PATH_CAPABILITIES: String = "capabilities"

-    const val PATH_REQUIREMENTS: String = "requirements"

-    const val PATH_INTERFACES: String = "interfaces"

-    const val PATH_OPERATIONS: String = "operations"

-    const val PATH_OUTPUTS: String = "outputs"

-    const val PATH_PROPERTIES: String = "properties"

-    const val PATH_ATTRIBUTES: String = "attributes"

-    const val PATH_ARTIFACTS: String = "artifacts"

-

-    const val MODEL_DIR_MODEL_TYPE: String = "definition-type"

-

-    const val MODEL_DEFINITION_TYPE_NODE_TYPE: String = "node_type"

-    const val MODEL_DEFINITION_TYPE_ARTIFACT_TYPE: String = "artifact_type"

-    const val MODEL_DEFINITION_TYPE_CAPABILITY_TYPE: String = "capability_type"

-    const val MODEL_DEFINITION_TYPE_RELATIONSHIP_TYPE: String = "relationship_type"

-    const val MODEL_DEFINITION_TYPE_DATA_TYPE: String = "data_type"

-

-    const val MODEL_TYPE_DATATYPES_ROOT: String = "tosca.datatypes.Root"

-    const val MODEL_TYPE_NODES_ROOT: String = "tosca.nodes.Root"

-    const val MODEL_TYPE_GROUPS_ROOT: String = "tosca.groups.Root"

-    const val MODEL_TYPE_RELATIONSHIPS_ROOT: String = "tosca.relationships.Root"

-    const val MODEL_TYPE_ARTIFACTS_ROOT: String = "tosca.artifacts.Root"

-    const val MODEL_TYPE_CAPABILITIES_ROOT: String = "tosca.capabilities.Root"

-    const val MODEL_TYPE_INTERFACES_ROOT: String = "tosca.interfaces.Root"

-

-    const val MODEL_TYPE_RELATIONSHIPS_DEPENDS_ON = "tosca.relationships.DependsOn"

-    const val MODEL_TYPE_RELATIONSHIPS_HOSTED_ON = "tosca.relationships.HostedOn"

-    const val MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO = "tosca.relationships.ConnectsTo"

-    const val MODEL_TYPE_RELATIONSHIPS_ATTACH_TO = "tosca.relationships.AttachesTo"

-    const val MODEL_TYPE_RELATIONSHIPS_ROUTES_TO = "tosca.relationships.RoutesTo"

-

-    const val MODEL_TYPE_NODE_DG = "tosca.nodes.DG"

-    const val MODEL_TYPE_NODE_COMPONENT = "tosca.nodes.Component"

-    const val MODEL_TYPE_NODE_VNF = "tosca.nodes.Vnf"

-    @Deprecated("Artifacts will be attached to Node Template")

-    const val MODEL_TYPE_NODE_ARTIFACT = "tosca.nodes.Artifact"

-    const val MODEL_TYPE_NODE_RESOURCE_SOURCE = "tosca.nodes.ResourceSource"

-

-    const val MODEL_TYPE_NODES_COMPONENT_JAVA: String = "tosca.nodes.component.Java"

-    const val MODEL_TYPE_NODES_COMPONENT_BUNDLE: String = "tosca.nodes.component.Bundle"

-    const val MODEL_TYPE_NODES_COMPONENT_SCRIPT: String = "tosca.nodes.component.Script"

-    const val MODEL_TYPE_NODES_COMPONENT_PYTHON: String = "tosca.nodes.component.Python"

-    const val MODEL_TYPE_NODES_COMPONENT_JYTHON: String = "tosca.nodes.component.Jython"

-    const val MODEL_TYPE_NODES_COMPONENT_JAVA_SCRIPT: String = "tosca.nodes.component.JavaScript"

-

-    const val MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION = "tosca.artifacts.Implementation"

-

-    const val MODEL_TYPE_DATA_TYPE_DYNAMIC = "tosca.datatypes.Dynamic"

-

-    const val MODEL_TYPE_CAPABILITY_TYPE_NODE = "tosca.capabilities.Node"

-    const val MODEL_TYPE_CAPABILITY_TYPE_COMPUTE = "tosca.capabilities.Compute"

-    const val MODEL_TYPE_CAPABILITY_TYPE_NETWORK = "tosca.capabilities.Network"

-    const val MODEL_TYPE_CAPABILITY_TYPE_STORAGE = "tosca.capabilities.Storage"

-    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT = "tosca.capabilities.Endpoint"

-    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_PUBLIC = "tosca.capabilities.Endpoint.Public"

-    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_ADMIN = "tosca.capabilities.Endpoint.Admin"

-    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_DATABASE = "tosca.capabilities.Endpoint.Database"

-    const val MODEL_TYPE_CAPABILITY_TYPE_ATTACHMENT = "tosca.capabilities.Attachment"

-    const val MODEL_TYPE_CAPABILITY_TYPE_OPERATION_SYSTEM = "tosca.capabilities.OperatingSystem"

-    const val MODEL_TYPE_CAPABILITY_TYPE_BINDABLE = "tosca.capabilities.network.Bindable"

-    // Custom capabilities

-    const val MODEL_TYPE_CAPABILITY_TYPE_CONTENT = "tosca.capabilities.Content"

-    const val MODEL_TYPE_CAPABILITY_TYPE_MAPPING = "tosca.capabilities.Mapping"

-    const val MODEL_TYPE_CAPABILITY_TYPE_NETCONF = "tosca.capabilities.Netconf"

-    const val MODEL_TYPE_CAPABILITY_TYPE_SSH = "tosca.capabilities.Ssh"

-    const val MODEL_TYPE_CAPABILITY_TYPE_SFTP = "tosca.capabilities.Sftp"

-

-    const val EXPRESSION_GET_INPUT: String = "get_input"

-    const val EXPRESSION_GET_ATTRIBUTE: String = "get_attribute"

-    const val EXPRESSION_GET_ARTIFACT: String = "get_artifact"

-    const val EXPRESSION_GET_PROPERTY: String = "get_property"

-    const val EXPRESSION_GET_OPERATION_OUTPUT: String = "get_operation_output"

-    const val EXPRESSION_GET_NODE_OF_TYPE: String = "get_nodes_of_type"

-

-    const val PROPERTY_BLUEPRINT_PROCESS_ID: String = "blueprint-process-id"

-    const val PROPERTY_BLUEPRINT_BASE_PATH: String = "blueprint-basePath"

-    const val PROPERTY_BLUEPRINT_RUNTIME: String = "blueprint-runtime"

-    const val PROPERTY_BLUEPRINT_INPUTS_DATA: String = "blueprint-inputs-data"

-    const val PROPERTY_BLUEPRINT_CONTEXT: String = "blueprint-context"

-    const val PROPERTY_BLUEPRINT_NAME: String = "template_name"

-    const val PROPERTY_BLUEPRINT_VERSION: String = "template_version"

-

-    const val TOSCA_METADATA_DIR: String = "TOSCA-Metadata"

-    const val TOSCA_METADATA_ENTRY_DEFINITION_FILE: String = "TOSCA-Metadata/TOSCA.meta"

-    const val TOSCA_DEFINITIONS_DIR: String = "Definitions"

-    const val TOSCA_PLANS_DIR: String = "Plans"

-    const val TOSCA_SCRIPTS_DIR: String = "Scripts"

-    const val TOSCA_MAPPINGS_DIR: String = "Mappings"

-    const val TOSCA_TEMPLATES_DIR: String = "Templates"

-

-    const val METADATA_USER_GROUPS = "user-groups"

-    const val METADATA_TEMPLATE_NAME = "template_name"

-    const val METADATA_TEMPLATE_VERSION = "template_version"

-    const val METADATA_TEMPLATE_AUTHOR = "template_author"

-    const val METADATA_TEMPLATE_TAGS = "template_tags"

-    const val METADATA_WORKFLOW_NAME = "workflow_name"

-

-    const val PAYLOAD_DATA = "payload-data"

-    const val PROPERTY_CURRENT_STEP = "current-step"

-    const val PROPERTY_CURRENT_NODE_TEMPLATE = "current-node-template"

-    const val PROPERTY_CURRENT_INTERFACE = "current-interface"

-    const val PROPERTY_CURRENT_OPERATION = "current-operation"

-    const val PROPERTY_CURRENT_IMPLEMENTATION = "current-implementation"

-    const val PROPERTY_EXECUTION_REQUEST = "execution-request"

-

-    const val OPERATION_PROCESS = "process"

-    const val OPERATION_PREPARE = "prepare"

-

-    const val BLUEPRINT_RETRIEVE_TYPE_DB = "db"

-    const val BLUEPRINT_RETRIEVE_TYPE_FILE = "file"

-    const val BLUEPRINT_RETRIEVE_TYPE_REPO = "repo"

-

+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.core
+
+/**
+ * BluePrintConstants
+ *
+ * @author Brinda Santh
+ */
+object BluePrintConstants {
+
+    const val RESPONSE_HEADER_TRANSACTION_ID: String = "X-ONAP-RequestID"
+    const val RESPONSE_HEADER_MINOR_VERSION: String = "X-MinorVersion"
+    const val RESPONSE_HEADER_PATCH_VERSION: String = "X-PatchVersion"
+    const val RESPONSE_HEADER_LATEST_VERSION: String = "X-LatestVersion"
+
+    const val STATUS_SUCCESS: String = "success"
+    const val STATUS_FAILURE: String = "failure"
+
+    const val TYPE_DEFAULT: String = "default"
+
+    const val DATA_TYPE_STRING: String = "string"
+    const val DATA_TYPE_INTEGER: String = "integer"
+    const val DATA_TYPE_FLOAT: String = "float"
+    const val DATA_TYPE_BOOLEAN: String = "boolean"
+    const val DATA_TYPE_TIMESTAMP: String = "timestamp"
+    const val DATA_TYPE_NULL: String = "null"
+    const val DATA_TYPE_LIST: String = "list"
+    const val DATA_TYPE_MAP: String = "map"
+
+    const val USER_SYSTEM: String = "System"
+
+    const val PATH_DIVIDER: String = "/"
+    const val PATH_SERVICE_TEMPLATE: String = "service_template"
+    const val PATH_TOPOLOGY_TEMPLATE: String = "topology_template"
+    const val PATH_METADATA: String = "metadata"
+    const val PATH_NODE_TYPES: String = "node_types"
+    const val PATH_POLICY_TYPES: String = "policy_types"
+    const val PATH_RELATIONSHIP_TYPES: String = "relationship_types"
+    const val PATH_ARTIFACT_TYPES: String = "artifact_types"
+    const val PATH_DATA_TYPES: String = "data_types"
+    const val PATH_INPUTS: String = "inputs"
+    const val PATH_NODE_WORKFLOWS: String = "workflows"
+    const val PATH_NODE_TEMPLATES: String = "node_templates"
+    const val PATH_CAPABILITIES: String = "capabilities"
+    const val PATH_REQUIREMENTS: String = "requirements"
+    const val PATH_INTERFACES: String = "interfaces"
+    const val PATH_OPERATIONS: String = "operations"
+    const val PATH_OUTPUTS: String = "outputs"
+    const val PATH_PROPERTIES: String = "properties"
+    const val PATH_ATTRIBUTES: String = "attributes"
+    const val PATH_ARTIFACTS: String = "artifacts"
+
+    const val MODEL_DIR_MODEL_TYPE: String = "definition-type"
+
+    const val MODEL_DEFINITION_TYPE_NODE_TYPE: String = "node_type"
+    const val MODEL_DEFINITION_TYPE_ARTIFACT_TYPE: String = "artifact_type"
+    const val MODEL_DEFINITION_TYPE_CAPABILITY_TYPE: String = "capability_type"
+    const val MODEL_DEFINITION_TYPE_RELATIONSHIP_TYPE: String = "relationship_type"
+    const val MODEL_DEFINITION_TYPE_DATA_TYPE: String = "data_type"
+
+    const val MODEL_TYPE_DATATYPES_ROOT: String = "tosca.datatypes.Root"
+    const val MODEL_TYPE_NODES_ROOT: String = "tosca.nodes.Root"
+    const val MODEL_TYPE_GROUPS_ROOT: String = "tosca.groups.Root"
+    const val MODEL_TYPE_RELATIONSHIPS_ROOT: String = "tosca.relationships.Root"
+    const val MODEL_TYPE_ARTIFACTS_ROOT: String = "tosca.artifacts.Root"
+    const val MODEL_TYPE_CAPABILITIES_ROOT: String = "tosca.capabilities.Root"
+    const val MODEL_TYPE_INTERFACES_ROOT: String = "tosca.interfaces.Root"
+
+    const val MODEL_TYPE_RELATIONSHIPS_DEPENDS_ON = "tosca.relationships.DependsOn"
+    const val MODEL_TYPE_RELATIONSHIPS_HOSTED_ON = "tosca.relationships.HostedOn"
+    const val MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO = "tosca.relationships.ConnectsTo"
+    const val MODEL_TYPE_RELATIONSHIPS_ATTACH_TO = "tosca.relationships.AttachesTo"
+    const val MODEL_TYPE_RELATIONSHIPS_ROUTES_TO = "tosca.relationships.RoutesTo"
+
+    const val MODEL_TYPE_NODE_DG = "tosca.nodes.DG"
+    const val MODEL_TYPE_NODE_COMPONENT = "tosca.nodes.Component"
+    const val MODEL_TYPE_NODE_VNF = "tosca.nodes.Vnf"
+    @Deprecated("Artifacts will be attached to Node Template")
+    const val MODEL_TYPE_NODE_ARTIFACT = "tosca.nodes.Artifact"
+    const val MODEL_TYPE_NODE_RESOURCE_SOURCE = "tosca.nodes.ResourceSource"
+
+    const val MODEL_TYPE_NODES_COMPONENT_JAVA: String = "tosca.nodes.component.Java"
+    const val MODEL_TYPE_NODES_COMPONENT_BUNDLE: String = "tosca.nodes.component.Bundle"
+    const val MODEL_TYPE_NODES_COMPONENT_SCRIPT: String = "tosca.nodes.component.Script"
+    const val MODEL_TYPE_NODES_COMPONENT_PYTHON: String = "tosca.nodes.component.Python"
+    const val MODEL_TYPE_NODES_COMPONENT_JYTHON: String = "tosca.nodes.component.Jython"
+    const val MODEL_TYPE_NODES_COMPONENT_JAVA_SCRIPT: String = "tosca.nodes.component.JavaScript"
+
+    const val MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION = "tosca.artifacts.Implementation"
+
+    const val MODEL_TYPE_DATA_TYPE_DYNAMIC = "tosca.datatypes.Dynamic"
+
+    const val MODEL_TYPE_CAPABILITY_TYPE_NODE = "tosca.capabilities.Node"
+    const val MODEL_TYPE_CAPABILITY_TYPE_COMPUTE = "tosca.capabilities.Compute"
+    const val MODEL_TYPE_CAPABILITY_TYPE_NETWORK = "tosca.capabilities.Network"
+    const val MODEL_TYPE_CAPABILITY_TYPE_STORAGE = "tosca.capabilities.Storage"
+    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT = "tosca.capabilities.Endpoint"
+    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_PUBLIC = "tosca.capabilities.Endpoint.Public"
+    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_ADMIN = "tosca.capabilities.Endpoint.Admin"
+    const val MODEL_TYPE_CAPABILITY_TYPE_ENDPOINT_DATABASE = "tosca.capabilities.Endpoint.Database"
+    const val MODEL_TYPE_CAPABILITY_TYPE_ATTACHMENT = "tosca.capabilities.Attachment"
+    const val MODEL_TYPE_CAPABILITY_TYPE_OPERATION_SYSTEM = "tosca.capabilities.OperatingSystem"
+    const val MODEL_TYPE_CAPABILITY_TYPE_BINDABLE = "tosca.capabilities.network.Bindable"
+    // Custom capabilities
+    const val MODEL_TYPE_CAPABILITY_TYPE_CONTENT = "tosca.capabilities.Content"
+    const val MODEL_TYPE_CAPABILITY_TYPE_MAPPING = "tosca.capabilities.Mapping"
+    const val MODEL_TYPE_CAPABILITY_TYPE_NETCONF = "tosca.capabilities.Netconf"
+    const val MODEL_TYPE_CAPABILITY_TYPE_SSH = "tosca.capabilities.Ssh"
+    const val MODEL_TYPE_CAPABILITY_TYPE_SFTP = "tosca.capabilities.Sftp"
+
+    const val EXPRESSION_GET_INPUT: String = "get_input"
+    const val EXPRESSION_GET_ATTRIBUTE: String = "get_attribute"
+    const val EXPRESSION_GET_ARTIFACT: String = "get_artifact"
+    const val EXPRESSION_GET_PROPERTY: String = "get_property"
+    const val EXPRESSION_GET_OPERATION_OUTPUT: String = "get_operation_output"
+    const val EXPRESSION_GET_NODE_OF_TYPE: String = "get_nodes_of_type"
+
+    const val PROPERTY_BLUEPRINT_PROCESS_ID: String = "blueprint-process-id"
+    const val PROPERTY_BLUEPRINT_BASE_PATH: String = "blueprint-basePath"
+    const val PROPERTY_BLUEPRINT_RUNTIME: String = "blueprint-runtime"
+    const val PROPERTY_BLUEPRINT_INPUTS_DATA: String = "blueprint-inputs-data"
+    const val PROPERTY_BLUEPRINT_CONTEXT: String = "blueprint-context"
+    const val PROPERTY_BLUEPRINT_NAME: String = "template_name"
+    const val PROPERTY_BLUEPRINT_VERSION: String = "template_version"
+
+    const val TOSCA_METADATA_DIR: String = "TOSCA-Metadata"
+    const val TOSCA_METADATA_ENTRY_DEFINITION_FILE: String = "TOSCA-Metadata/TOSCA.meta"
+    const val TOSCA_DEFINITIONS_DIR: String = "Definitions"
+    const val TOSCA_PLANS_DIR: String = "Plans"
+    const val TOSCA_SCRIPTS_DIR: String = "Scripts"
+    const val TOSCA_MAPPINGS_DIR: String = "Mappings"
+    const val TOSCA_TEMPLATES_DIR: String = "Templates"
+
+    const val METADATA_USER_GROUPS = "user-groups"
+    const val METADATA_TEMPLATE_NAME = "template_name"
+    const val METADATA_TEMPLATE_VERSION = "template_version"
+    const val METADATA_TEMPLATE_AUTHOR = "template_author"
+    const val METADATA_TEMPLATE_TAGS = "template_tags"
+    const val METADATA_WORKFLOW_NAME = "workflow_name"
+
+    const val PAYLOAD_DATA = "payload-data"
+    const val PROPERTY_CURRENT_STEP = "current-step"
+    const val PROPERTY_CURRENT_NODE_TEMPLATE = "current-node-template"
+    const val PROPERTY_CURRENT_INTERFACE = "current-interface"
+    const val PROPERTY_CURRENT_OPERATION = "current-operation"
+    const val PROPERTY_CURRENT_IMPLEMENTATION = "current-implementation"
+    const val PROPERTY_EXECUTION_REQUEST = "execution-request"
+
+    const val OPERATION_PROCESS = "process"
+    const val OPERATION_PREPARE = "prepare"
+
+    const val BLUEPRINT_RETRIEVE_TYPE_DB = "db"
+    const val BLUEPRINT_RETRIEVE_TYPE_FILE = "file"
+    const val BLUEPRINT_RETRIEVE_TYPE_REPO = "repo"
+
 }
\ No newline at end of file
diff --git a/components/core/src/test/resources/dictionary/dictionary_schema.json b/components/core/src/test/resources/dictionary/dictionary_schema.json
index d03170050..f9ef9eeed 100644
--- a/components/core/src/test/resources/dictionary/dictionary_schema.json
+++ b/components/core/src/test/resources/dictionary/dictionary_schema.json
@@ -104,7 +104,7 @@
 						}

 					}

 				},

-				"db": {

+				"primary-db": {

 					"type": "object",

 					"properties": {

 						"query": {

@@ -210,7 +210,7 @@
 						}

 					}

 				},

-				"db": {

+				"primary-db": {

 					"type": "object",

 					"properties": {

 						"names": {