From 3121b5bee2e70b1f753f9988344d41f3132edf69 Mon Sep 17 00:00:00 2001 From: Vidyashree-Huawei Date: Wed, 4 Mar 2020 19:22:08 +0530 Subject: CLAMP-CDS integration to display all CDS actions for blueprint in CL CLAMP-CDS integration to display all CDS actions for blueprint in CL Change-Id: I18b972b8952e5de9ac8e39d6c9cc4ecba0ec9b02 Issue-ID: CLAMP-491 Signed-off-by: Vidyashree-Huawei --- src/main/resources/clds/camel/routes/cds-flows.xml | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/main/resources/clds/camel/routes/cds-flows.xml (limited to 'src/main/resources/clds/camel/routes/cds-flows.xml') diff --git a/src/main/resources/clds/camel/routes/cds-flows.xml b/src/main/resources/clds/camel/routes/cds-flows.xml new file mode 100644 index 000000000..5c10a0cd2 --- /dev/null +++ b/src/main/resources/clds/camel/routes/cds-flows.xml @@ -0,0 +1,46 @@ + + + + + + + + GET + + + application/json + + + + + + + + + + + + + + + + + POST + + + application/json + + + + + + + + + + + \ No newline at end of file -- cgit 1.2.3-korg From d187e9e689fe39cbabe9cb82ea6959e49ff64354 Mon Sep 17 00:00:00 2001 From: sebdet Date: Thu, 23 Apr 2020 00:44:32 +0200 Subject: Fix refresh action Fix the refresh action so that it well retriggered cds call when required, otherwise the refresh button is useless + get out the cds code from service installer Issue-ID: CLAMP-818 Signed-off-by: sebdet Change-Id: Ia5784d75e1bd158ff775674fe6bf0c2c39b55ad4 --- .../org/onap/clamp/clds/client/CdsServices.java | 9 +- .../execution/cds/ToscaMetadataCdsProcess.java | 12 +- .../java/org/onap/clamp/loop/CsarInstaller.java | 9 +- .../org/onap/clamp/loop/cds/CdsDataInstaller.java | 167 +++++++++++++++++++++ .../clamp/loop/service/CsarServiceInstaller.java | 54 ------- .../OperationalPolicyRepresentationBuilder.java | 2 +- .../resources/clds/camel/rest/clamp-api-v2.xml | 8 +- src/main/resources/clds/camel/routes/cds-flows.xml | 18 +++ .../onap/clamp/clds/client/CdsServicesTest.java | 2 - .../org/onap/clamp/loop/CsarInstallerItCase.java | 8 +- ...OperationalPolicyRepresentationBuilderTest.java | 9 +- 11 files changed, 221 insertions(+), 77 deletions(-) create mode 100644 src/main/java/org/onap/clamp/loop/cds/CdsDataInstaller.java (limited to 'src/main/resources/clds/camel/routes/cds-flows.xml') diff --git a/src/main/java/org/onap/clamp/clds/client/CdsServices.java b/src/main/java/org/onap/clamp/clds/client/CdsServices.java index b8eb41946..fa15e2778 100644 --- a/src/main/java/org/onap/clamp/clds/client/CdsServices.java +++ b/src/main/java/org/onap/clamp/clds/client/CdsServices.java @@ -84,8 +84,11 @@ public class CdsServices { Date startTime = new Date(); LoggingUtils.setTimeContext(startTime, new Date()); return JsonUtils.GSON_JPA_MODEL.fromJson(cdsResponse, CdsBpWorkFlowListResponse.class); + } else { + logger.error("CDS getBlueprintWorkflowList FAILED"); + return null; } - return null; + } /** @@ -114,8 +117,10 @@ public class CdsServices { Date startTime = new Date(); LoggingUtils.setTimeContext(startTime, new Date()); return parseCdsResponse(cdsResponse); + } else { + logger.error("CDS getWorkflowInputProperties FAILED"); + return null; } - return null; } protected JsonObject parseCdsResponse(String response) { diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java b/src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java index c92cad1f5..94a477fe5 100644 --- a/src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java +++ b/src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java @@ -28,23 +28,16 @@ import static org.onap.clamp.clds.tosca.ToscaSchemaConstants.TYPE; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; - import java.util.Map; import java.util.Set; - import org.onap.clamp.clds.tosca.update.execution.ToscaMetadataProcess; import org.onap.clamp.loop.service.Service; -import org.onap.clamp.tosca.DictionaryService; -import org.springframework.beans.factory.annotation.Autowired; /** * This class is there to add the JsonObject for CDS in the json Schema according to what is found in the Tosca model. */ public class ToscaMetadataCdsProcess extends ToscaMetadataProcess { - @Autowired - private DictionaryService dictionaryService; - @Override public void executeProcess(String parameters, JsonObject childObject, Service serviceModel) { switch (parameters) { @@ -59,6 +52,7 @@ public class ToscaMetadataCdsProcess extends ToscaMetadataProcess { case "operation": generateOperation(childObject, serviceModel); break; + default: } } @@ -83,7 +77,7 @@ public class ToscaMetadataCdsProcess extends ToscaMetadataProcess { .entrySet()) { JsonObject controllerProperties = entry.getValue().getAsJsonObject() .getAsJsonObject("controllerProperties"); - if (controllerProperties != null) { + if (controllerProperties != null && controllerProperties.getAsJsonObject("workflows") != null) { for (String workflowsEntry : controllerProperties.getAsJsonObject("workflows").keySet()) { schemaEnum.add(workflowsEntry); schemaTitle.add(workflowsEntry + " (CDS operation)"); @@ -107,7 +101,7 @@ public class ToscaMetadataCdsProcess extends ToscaMetadataProcess { .entrySet()) { JsonObject controllerProperties = entry.getValue().getAsJsonObject() .getAsJsonObject("controllerProperties"); - if (controllerProperties != null) { + if (controllerProperties != null && controllerProperties.getAsJsonObject("workflows") != null) { for (Map.Entry workflowsEntry : controllerProperties.getAsJsonObject("workflows") .entrySet()) { JsonObject obj = new JsonObject(); diff --git a/src/main/java/org/onap/clamp/loop/CsarInstaller.java b/src/main/java/org/onap/clamp/loop/CsarInstaller.java index b5ebdb949..67c7ce5cf 100644 --- a/src/main/java/org/onap/clamp/loop/CsarInstaller.java +++ b/src/main/java/org/onap/clamp/loop/CsarInstaller.java @@ -40,6 +40,7 @@ import org.onap.clamp.clds.sdc.controller.installer.BlueprintMicroService; import org.onap.clamp.clds.sdc.controller.installer.BlueprintParser; import org.onap.clamp.clds.sdc.controller.installer.ChainGenerator; import org.onap.clamp.clds.sdc.controller.installer.CsarHandler; +import org.onap.clamp.loop.cds.CdsDataInstaller; import org.onap.clamp.loop.service.CsarServiceInstaller; import org.onap.clamp.loop.service.Service; import org.onap.clamp.loop.template.LoopElementModel; @@ -78,6 +79,9 @@ public class CsarInstaller { @Autowired private CsarServiceInstaller csarServiceInstaller; + @Autowired + private CdsDataInstaller cdsDataInstaller; + @Autowired private PolicyEngineServices policyEngineServices; @@ -113,7 +117,10 @@ public class CsarInstaller { public void installTheCsar(CsarHandler csar) throws SdcArtifactInstallerException, InterruptedException, BlueprintParserException { logger.info("Installing the CSAR " + csar.getFilePath()); - installTheLoopTemplates(csar, csarServiceInstaller.installTheService(csar)); + Service associatedService = csarServiceInstaller.installTheService(csar); + cdsDataInstaller.installCdsServiceProperties(csar, associatedService); + + installTheLoopTemplates(csar, associatedService); logger.info("Successfully installed the CSAR " + csar.getFilePath()); } diff --git a/src/main/java/org/onap/clamp/loop/cds/CdsDataInstaller.java b/src/main/java/org/onap/clamp/loop/cds/CdsDataInstaller.java new file mode 100644 index 000000000..9c1cd3bc2 --- /dev/null +++ b/src/main/java/org/onap/clamp/loop/cds/CdsDataInstaller.java @@ -0,0 +1,167 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2019 AT&T Intellectual Property. All rights + * reserved. + * * Modifications Copyright (C) 2020 Huawei Technologies Co., Ltd. + * ================================================================================ + * 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. + * ============LICENSE_END============================================ + * =================================================================== + * + */ + +package org.onap.clamp.loop.cds; + +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; +import com.google.gson.JsonObject; +import org.onap.clamp.clds.client.CdsServices; +import org.onap.clamp.clds.model.cds.CdsBpWorkFlowListResponse; +import org.onap.clamp.clds.sdc.controller.installer.CsarHandler; +import org.onap.clamp.loop.service.Service; +import org.onap.clamp.loop.service.ServicesRepository; +import org.onap.sdc.tosca.parser.enums.SdcTypes; +import org.onap.sdc.toscaparser.api.NodeTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * This class installs the cds data in the service model properties. + * This can be refreshed later on by clicking on the button refresh, when recomputing the json schema. + */ +@Component +public class CdsDataInstaller { + + private static final EELFLogger logger = EELFManager.getInstance().getLogger(CdsDataInstaller.class); + + @Autowired + CdsServices cdsServices; + + @Autowired + ServicesRepository serviceRepository; + + public static final String CONTROLLER_PROPERTIES = "controllerProperties"; + public static final String SDNC_MODEL_NAME = "sdnc_model_name"; + public static final String SDNC_MODEL_VERSION = "sdnc_model_version"; + + /** + * This method installs the service model properties for CDS in the service object given in input. + * + * @param csar The csar from sdc + * @param service the service object already provisioned with csar data + */ + @Transactional(propagation = Propagation.REQUIRES_NEW) + public Service installCdsServiceProperties(CsarHandler csar, Service service) { + // Iterate on all types defined in the tosca lib + for (SdcTypes type : SdcTypes.values()) { + JsonObject resourcesPropByType = service.getResourceByType(type.getValue()); + // For each type, get the metadata of each nodetemplate + for (NodeTemplate nodeTemplate : csar.getSdcCsarHelper().getServiceNodeTemplateBySdcType(type)) { + // get cds artifact information and save in resources Prop + if (SdcTypes.PNF == type || SdcTypes.VF == type) { + JsonObject controllerProperties = createCdsArtifactProperties(nodeTemplate.getPropertyValue( + SDNC_MODEL_NAME).toString(), + nodeTemplate.getPropertyValue(SDNC_MODEL_VERSION).toString()); + if (controllerProperties != null) { + resourcesPropByType.getAsJsonObject(nodeTemplate.getName()) + .add(CONTROLLER_PROPERTIES, controllerProperties); + } + } + } + } + serviceRepository.save(service); + logger.info("Successfully installed the CDS data in Service"); + return service; + } + + /** + * This method updates the service model properties for CDS in the service object given in input. + * + * @param service the service object already provisioned with csar data + */ + @Transactional(propagation = Propagation.REQUIRES_NEW) + public Service updateCdsServiceProperties(Service service) { + // Iterate on all types defined in the tosca lib + for (SdcTypes type : SdcTypes.values()) { + JsonObject resourcesPropByType = service.getResourceByType(type.getValue()); + for (String resourceName : resourcesPropByType.keySet()) { + // get cds artifact information and save in resources Prop + if ((SdcTypes.PNF == type || SdcTypes.VF == type) && resourcesPropByType.getAsJsonObject(resourceName) + .getAsJsonObject(CONTROLLER_PROPERTIES) != null) { + JsonObject controllerProperties = + createCdsArtifactProperties(resourcesPropByType.getAsJsonObject(resourceName) + .getAsJsonObject(CONTROLLER_PROPERTIES).get(SDNC_MODEL_NAME) + .getAsString(), + resourcesPropByType.getAsJsonObject(resourceName) + .getAsJsonObject(CONTROLLER_PROPERTIES).get(SDNC_MODEL_VERSION) + .getAsString()); + if (controllerProperties != null) { + resourcesPropByType.getAsJsonObject(resourceName) + .add(CONTROLLER_PROPERTIES, controllerProperties); + } + } + } + } + serviceRepository.save(service); + logger.info("Successfully updated the CDS data in Service"); + return service; + } + + /** + * Retrieve CDS artifacts information from node template and save in resource object. + * + * @param sdncModelName sdnc model name + * @param sdncModelVersion sdnc model version + * @return Returns CDS artifacts information + */ + private JsonObject createCdsArtifactProperties(String sdncModelName, String sdncModelVersion) { + if (sdncModelName != null && sdncModelVersion != null) { + JsonObject controllerProperties = new JsonObject(); + controllerProperties.addProperty(SDNC_MODEL_NAME, sdncModelName); + controllerProperties.addProperty(SDNC_MODEL_VERSION, sdncModelVersion); + + CdsBpWorkFlowListResponse response = + queryCdsToGetWorkFlowList(sdncModelName, sdncModelVersion); + if (response == null) { + return controllerProperties; + } + + JsonObject workFlowProps = new JsonObject(); + for (String workFlow : response.getWorkflows()) { + logger.info("Found CDS workflow " + workFlow + " for model name " + sdncModelName + " and version " + + sdncModelVersion); + JsonObject inputs = queryCdsToGetWorkFlowInputProperties(response.getBlueprintName(), + response.getVersion(), workFlow); + workFlowProps.add(workFlow, inputs); + } + + controllerProperties.add("workflows", workFlowProps); + return controllerProperties; + } + return null; + } + + + private CdsBpWorkFlowListResponse queryCdsToGetWorkFlowList(String artifactName, String artifactVersion) { + return cdsServices.getBlueprintWorkflowList(artifactName, artifactVersion); + } + + private JsonObject queryCdsToGetWorkFlowInputProperties(String artifactName, String artifactVersion, + String workFlow) { + return cdsServices.getWorkflowInputProperties(artifactName, artifactVersion, workFlow); + } +} diff --git a/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java b/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java index 6db6d920f..c43f2cb6d 100644 --- a/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java +++ b/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java @@ -28,9 +28,7 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.google.gson.JsonObject; import java.util.Map.Entry; -import org.onap.clamp.clds.client.CdsServices; import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException; -import org.onap.clamp.clds.model.cds.CdsBpWorkFlowListResponse; import org.onap.clamp.clds.sdc.controller.installer.CsarHandler; import org.onap.clamp.clds.util.JsonUtils; import org.onap.sdc.tosca.parser.api.IEntityDetails; @@ -54,9 +52,6 @@ public class CsarServiceInstaller { @Autowired ServicesRepository serviceRepository; - @Autowired - CdsServices cdsServices; - /** * Install the Service from the csar. * @@ -90,14 +85,6 @@ public class CsarServiceInstaller { for (NodeTemplate nodeTemplate : csar.getSdcCsarHelper().getServiceNodeTemplateBySdcType(type)) { resourcesPropByType.add(nodeTemplate.getName(), JsonUtils.GSON.toJsonTree(nodeTemplate.getMetaData().getAllProperties())); - // get cds artifact information and save in resources Prop - if (SdcTypes.PNF == type || SdcTypes.VF == type) { - JsonObject controllerProperties = createCdsArtifactProperties(nodeTemplate); - if (controllerProperties != null) { - resourcesPropByType.getAsJsonObject(nodeTemplate.getName()) - .add("controllerProperties", controllerProperties); - } - } } resourcesProp.add(type.getValue(), resourcesPropByType); } @@ -139,45 +126,4 @@ public class CsarServiceInstaller { return alreadyInstalled; } - - /** - * Retrive CDS artifacts information from node template and save in resource object. - * - * @param nodeTemplate node template - * @return Returns CDS artifacts information - */ - private JsonObject createCdsArtifactProperties(NodeTemplate nodeTemplate) { - Object artifactName = nodeTemplate.getPropertyValue("sdnc_model_name"); - Object artifactVersion = nodeTemplate.getPropertyValue("sdnc_model_version"); - if (artifactName != null && artifactVersion != null) { - CdsBpWorkFlowListResponse response = - queryCdsToGetWorkFlowList(artifactName.toString(), artifactVersion.toString()); - if (response == null) { - return null; - } - - JsonObject workFlowProps = new JsonObject(); - for (String workFlow : response.getWorkflows()) { - JsonObject inputs = queryCdsToGetWorkFlowInputProperties(response.getBlueprintName(), - response.getVersion(), workFlow); - workFlowProps.add(workFlow, inputs); - } - - JsonObject controllerProperties = new JsonObject(); - controllerProperties.addProperty("sdnc_model_name", artifactName.toString()); - controllerProperties.addProperty("sdnc_model_version", artifactVersion.toString()); - controllerProperties.add("workflows", workFlowProps); - return controllerProperties; - } - return null; - } - - private CdsBpWorkFlowListResponse queryCdsToGetWorkFlowList(String artifactName, String artifactVersion) { - return cdsServices.getBlueprintWorkflowList(artifactName, artifactVersion); - } - - private JsonObject queryCdsToGetWorkFlowInputProperties(String artifactName, String artifactVersion, - String workFlow) { - return cdsServices.getWorkflowInputProperties(artifactName, artifactVersion, workFlow); - } } diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java index 57d13ef17..787698ada 100644 --- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java +++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java @@ -198,7 +198,7 @@ public class OperationalPolicyRepresentationBuilder { JsonObject controllerProperties = entry.getValue().getAsJsonObject() .getAsJsonObject("controllerProperties"); - if (controllerProperties != null) { + if (controllerProperties != null && controllerProperties.getAsJsonObject("workflows") != null) { JsonObject workflows = controllerProperties.getAsJsonObject("workflows"); for (Entry workflowsEntry : workflows.entrySet()) { JsonObject obj = new JsonObject(); diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml index 879c9b707..97768e403 100644 --- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml +++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml @@ -283,7 +283,9 @@ uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" /> + uri="bean:org.onap.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})" /> + + uri="bean:org.onap.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})" /> + + + java.lang.Exception + + true + + + + @@ -37,6 +46,15 @@ message="Endpoint to query input properties for workflow from CDS : {{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec"> + + java.lang.Exception + + true + + + + diff --git a/src/test/java/org/onap/clamp/clds/client/CdsServicesTest.java b/src/test/java/org/onap/clamp/clds/client/CdsServicesTest.java index ec39fc3db..9fdc727bc 100644 --- a/src/test/java/org/onap/clamp/clds/client/CdsServicesTest.java +++ b/src/test/java/org/onap/clamp/clds/client/CdsServicesTest.java @@ -23,9 +23,7 @@ package org.onap.clamp.clds.client; import com.google.gson.JsonObject; - import java.io.IOException; - import org.junit.Test; import org.onap.clamp.clds.util.JsonUtils; import org.onap.clamp.clds.util.ResourceFileUtil; diff --git a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java index ac7b236e8..d14975238 100644 --- a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java +++ b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java @@ -50,6 +50,7 @@ import org.onap.clamp.clds.sdc.controller.installer.BlueprintArtifact; import org.onap.clamp.clds.sdc.controller.installer.CsarHandler; import org.onap.clamp.clds.util.JsonUtils; import org.onap.clamp.clds.util.ResourceFileUtil; +import org.onap.clamp.loop.cds.CdsDataInstaller; import org.onap.clamp.loop.service.ServicesRepository; import org.onap.clamp.loop.template.LoopTemplate; import org.onap.clamp.loop.template.LoopTemplateLoopElementModel; @@ -180,8 +181,7 @@ public class CsarInstallerItCase { CsarHandler csarHandler = new CsarHandler(notificationData, "", ""); csarHandler .setFilePath(Thread.currentThread().getContextClassLoader().getResource(CSAR_ARTIFACT_NAME).getFile()); - Optional testyaml = csarHandler.getPolicyModelYaml(); - Assert.assertEquals(testyaml, Optional + Assert.assertEquals(csarHandler.getPolicyModelYaml(), Optional .ofNullable(ResourceFileUtil.getResourceAsString("example/sdc/expected-result/policy-data.yaml"))); } @@ -205,6 +205,10 @@ public class CsarInstallerItCase { CsarHandler csar = buildFakeCsarHandler(generatedName); csarInstaller.installTheCsar(csar); assertThat(serviceRepository.existsById("63cac700-ab9a-4115-a74f-7eac85e3fce0")).isTrue(); + // We should have CDS info + assertThat(serviceRepository.findById("63cac700-ab9a-4115-a74f-7eac85e3fce0").get().getResourceByType("VF") + .getAsJsonObject("vLoadBalancerMS 0").getAsJsonObject( + CdsDataInstaller.CONTROLLER_PROPERTIES)).isNotNull(); assertThat(loopTemplatesRepo.existsById(LoopTemplate.generateLoopTemplateName(generatedName, "1.0", RESOURCE_INSTANCE_NAME_RESOURCE1, "tca.yaml"))).isTrue(); assertThat(loopTemplatesRepo.existsById(LoopTemplate.generateLoopTemplateName(generatedName, "1.0", diff --git a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java b/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java index a6a496821..b90a28616 100644 --- a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java +++ b/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java @@ -55,12 +55,13 @@ public class OperationalPolicyRepresentationBuilderTest { JsonObject jsonModel = new GsonBuilder().create() .fromJson(ResourceFileUtil.getResourceAsString("tosca/model-properties-cds.json"), JsonObject.class); Service service = new Service(jsonModel.get("serviceDetails").getAsJsonObject(), - jsonModel.get("resourceDetails").getAsJsonObject(), - "1.0"); + jsonModel.get("resourceDetails").getAsJsonObject(), + "1.0"); JsonObject jsonSchema = OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(service); assertThat(jsonSchema).isNotNull(); - JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/operational-policy-cds-payload-with-list.json"), - new GsonBuilder().create().toJson(jsonSchema), false); + JSONAssert.assertEquals( + ResourceFileUtil.getResourceAsString("tosca/operational-policy-cds-payload-with-list.json"), + new GsonBuilder().create().toJson(jsonSchema), false); } } -- cgit 1.2.3-korg From 88fd35f7b46041f723cff0eaaf4ea4ed46e9530f Mon Sep 17 00:00:00 2001 From: sebdet Date: Fri, 9 Oct 2020 16:32:12 +0200 Subject: Fix the DCAE query The DCAE deployment URL can contain URI parameters that crashes the URL used by HTTP4 Camel. Also the parameter connectionTimeToLive is removed as it is transmitted in each call. The SDC client is also updated to 1.4.1 Issue-ID: CLAMP-954 Signed-off-by: sebdet Change-Id: Ieebdfe009f4339188c75c7a3365546779a087561 Signed-off-by: sebdet --- docs/swagger/swagger.json | 466 +- docs/swagger/swagger.pdf | 5954 ++++++++++---------- extra/bin-for-dev/start-db.sh | 2 +- extra/sql/dump/test-data.sql | 63 +- pom.xml | 4 +- src/main/resources/META-INF/resources/swagger.html | 156 +- src/main/resources/clds/camel/routes/cds-flows.xml | 4 +- .../resources/clds/camel/routes/dcae-flows.xml | 956 ++-- .../resources/clds/camel/routes/policy-flows.xml | 20 +- .../clds/tosca/update/JsonTemplateManagerTest.java | 24 +- .../ToscaConverterWithDictionarySupportItCase.java | 3 +- .../.file | 96 - .../.header | 1 - .../api/v1/blueprint-model/workflow-spec/.file | 96 + .../api/v1/blueprint-model/workflow-spec/.header | 1 + .../1.0.0?connectionTimeToLive=5000/.file | 12 - .../1.0.0?connectionTimeToLive=5000/.header | 1 - .../baseconfiguration/version/1.0.0/.file | 12 + .../baseconfiguration/version/1.0.0/.header | 1 + .../.file | 46 - .../.header | 1 - .../example/policy/api/v1/policytypes/.file | 46 + .../example/policy/api/v1/policytypes/.header | 1 + .../1.0.0?connectionTimeToLive=5000/.file | 38 - .../1.0.0?connectionTimeToLive=5000/.header | 1 - .../versions/1.0.0/.file | 38 + .../versions/1.0.0/.header | 1 + .../1.0.0?connectionTimeToLive=5000/.file | 47 - .../1.0.0?connectionTimeToLive=5000/.header | 1 - .../versions/1.0.0/.file | 47 + .../versions/1.0.0/.header | 1 + .../1.0.0?connectionTimeToLive=5000/.file | 80 - .../1.0.0?connectionTimeToLive=5000/.header | 1 - .../versions/1.0.0/.file | 80 + .../versions/1.0.0/.header | 1 + .../2.0.0?connectionTimeToLive=5000/.file | 40 - .../2.0.0?connectionTimeToLive=5000/.header | 1 - .../versions/2.0.0/.file | 40 + .../versions/2.0.0/.header | 1 + .../1.0.0?connectionTimeToLive=5000/.file | 360 -- .../1.0.0?connectionTimeToLive=5000/.header | 1 - .../versions/1.0.0/.file | 360 ++ .../versions/1.0.0/.header | 1 + .../1.0.0?connectionTimeToLive=5000/.file | 150 - .../1.0.0?connectionTimeToLive=5000/.header | 1 - .../versions/1.0.0/.file | 150 + .../versions/1.0.0/.header | 1 + .../1.0.0?connectionTimeToLive=5000/.file | 158 - .../1.0.0?connectionTimeToLive=5000/.header | 1 - .../versions/1.0.0/.file | 158 + .../versions/1.0.0/.header | 1 + .../v1/pdps?connectionTimeToLive=5000/.file | 80 - .../v1/pdps?connectionTimeToLive=5000/.header | 1 - .../http-cache/example/policy/pap/v1/pdps/.file | 80 + .../http-cache/example/policy/pap/v1/pdps/.header | 1 + src/test/resources/http-cache/third_party_proxy.py | 4 +- 56 files changed, 4857 insertions(+), 5035 deletions(-) delete mode 100644 src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec?connectionTimeToLive=5000/.file delete mode 100644 src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec?connectionTimeToLive=5000/.header create mode 100644 src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file create mode 100644 src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header delete mode 100644 src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0?connectionTimeToLive=5000/.file delete mode 100644 src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0?connectionTimeToLive=5000/.header create mode 100644 src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file create mode 100644 src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes?connectionTimeToLive=5000/.file delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes?connectionTimeToLive=5000/.header create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/.file create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/.header delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0?connectionTimeToLive=5000/.file delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0?connectionTimeToLive=5000/.header create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0?connectionTimeToLive=5000/.file delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0?connectionTimeToLive=5000/.header create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0?connectionTimeToLive=5000/.file delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0?connectionTimeToLive=5000/.header create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0?connectionTimeToLive=5000/.file delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0?connectionTimeToLive=5000/.header create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.file delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.header create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.file delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.header create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0?connectionTimeToLive=5000/.file delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0?connectionTimeToLive=5000/.header create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header delete mode 100644 src/test/resources/http-cache/example/policy/pap/v1/pdps?connectionTimeToLive=5000/.file delete mode 100644 src/test/resources/http-cache/example/policy/pap/v1/pdps?connectionTimeToLive=5000/.header create mode 100644 src/test/resources/http-cache/example/policy/pap/v1/pdps/.file create mode 100644 src/test/resources/http-cache/example/policy/pap/v1/pdps/.header (limited to 'src/main/resources/clds/camel/routes/cds-flows.xml') diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json index fbd9c48dd..1c6dde16b 100644 --- a/docs/swagger/swagger.json +++ b/docs/swagger/swagger.json @@ -1,16 +1,16 @@ { "swagger" : "2.0", "info" : { - "version" : "5.1.0-SNAPSHOT", + "version" : "5.1.3-SNAPSHOT", "title" : "Clamp Rest API" }, - "host" : "localhost:43065", + "host" : "localhost:8443", "basePath" : "/restservices/clds/", "schemes" : [ "http" ], "paths" : { "/v2/clampInformation" : { "get" : { - "operationId" : "route142", + "operationId" : "route34", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -20,13 +20,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route142" + "x-camelContextId" : "camel-1", + "x-routeId" : "route34" } }, "/v2/dictionary" : { "get" : { - "operationId" : "route127", + "operationId" : "route19", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -36,11 +36,11 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route127" + "x-camelContextId" : "camel-1", + "x-routeId" : "route19" }, "put" : { - "operationId" : "route130", + "operationId" : "route22", "consumes" : [ "application/json" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -59,13 +59,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route130" + "x-camelContextId" : "camel-1", + "x-routeId" : "route22" } }, "/v2/dictionary/{dictionaryName}" : { "get" : { - "operationId" : "route129", + "operationId" : "route21", "produces" : [ "application/json" ], "parameters" : [ { "name" : "dictionaryName", @@ -81,13 +81,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route129" + "x-camelContextId" : "camel-1", + "x-routeId" : "route21" } }, "/v2/dictionary/{name}" : { "put" : { - "operationId" : "route131", + "operationId" : "route23", "consumes" : [ "application/json" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -111,11 +111,11 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route131" + "x-camelContextId" : "camel-1", + "x-routeId" : "route23" }, "delete" : { - "operationId" : "route132", + "operationId" : "route24", "produces" : [ "application/json" ], "parameters" : [ { "name" : "name", @@ -126,13 +126,13 @@ "responses" : { "200" : { } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route132" + "x-camelContextId" : "camel-1", + "x-routeId" : "route24" } }, "/v2/dictionary/{name}/elements/{shortName}" : { "delete" : { - "operationId" : "route133", + "operationId" : "route25", "produces" : [ "application/json" ], "parameters" : [ { "name" : "name", @@ -148,13 +148,13 @@ "responses" : { "200" : { } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route133" + "x-camelContextId" : "camel-1", + "x-routeId" : "route25" } }, "/v2/dictionary/secondary/names" : { "get" : { - "operationId" : "route128", + "operationId" : "route20", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -167,13 +167,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route128" + "x-camelContextId" : "camel-1", + "x-routeId" : "route20" } }, "/v2/loop/{loopName}" : { "get" : { - "operationId" : "route111", + "operationId" : "route3", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -189,13 +189,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route111" + "x-camelContextId" : "camel-1", + "x-routeId" : "route3" } }, "/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" : { "put" : { - "operationId" : "route124", + "operationId" : "route16", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -221,13 +221,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route124" + "x-camelContextId" : "camel-1", + "x-routeId" : "route16" } }, "/v2/loop/create/{loopName}?templateName={templateName}" : { "post" : { - "operationId" : "route126", + "operationId" : "route18", "consumes" : [ "application/json" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -244,13 +244,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route126" + "x-camelContextId" : "camel-1", + "x-routeId" : "route18" } }, "/v2/loop/delete/{loopName}" : { "put" : { - "operationId" : "route122", + "operationId" : "route14", "parameters" : [ { "name" : "loopName", "in" : "path", @@ -260,13 +260,13 @@ "responses" : { "200" : { } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route122" + "x-camelContextId" : "camel-1", + "x-routeId" : "route14" } }, "/v2/loop/deploy/{loopName}" : { "put" : { - "operationId" : "route115", + "operationId" : "route7", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -282,13 +282,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route115" + "x-camelContextId" : "camel-1", + "x-routeId" : "route7" } }, "/v2/loop/getAllNames" : { "get" : { - "operationId" : "route110", + "operationId" : "route2", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -301,13 +301,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route110" + "x-camelContextId" : "camel-1", + "x-routeId" : "route2" } }, "/v2/loop/getstatus/{loopName}" : { "get" : { - "operationId" : "route123", + "operationId" : "route15", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -323,13 +323,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route123" + "x-camelContextId" : "camel-1", + "x-routeId" : "route15" } }, "/v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}" : { "put" : { - "operationId" : "route116", + "operationId" : "route8", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -350,13 +350,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route116" + "x-camelContextId" : "camel-1", + "x-routeId" : "route8" } }, "/v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}" : { "put" : { - "operationId" : "route117", + "operationId" : "route9", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -377,13 +377,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route117" + "x-camelContextId" : "camel-1", + "x-routeId" : "route9" } }, "/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}" : { "put" : { - "operationId" : "route125", + "operationId" : "route17", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -414,13 +414,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route125" + "x-camelContextId" : "camel-1", + "x-routeId" : "route17" } }, "/v2/loop/restart/{loopName}" : { "put" : { - "operationId" : "route120", + "operationId" : "route12", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -436,13 +436,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route120" + "x-camelContextId" : "camel-1", + "x-routeId" : "route12" } }, "/v2/loop/stop/{loopName}" : { "put" : { - "operationId" : "route119", + "operationId" : "route11", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -458,13 +458,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route119" + "x-camelContextId" : "camel-1", + "x-routeId" : "route11" } }, "/v2/loop/submit/{loopName}" : { "put" : { - "operationId" : "route121", + "operationId" : "route13", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -480,13 +480,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route121" + "x-camelContextId" : "camel-1", + "x-routeId" : "route13" } }, "/v2/loop/undeploy/{loopName}" : { "put" : { - "operationId" : "route118", + "operationId" : "route10", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -502,13 +502,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route118" + "x-camelContextId" : "camel-1", + "x-routeId" : "route10" } }, "/v2/loop/updateGlobalProperties/{loopName}" : { "post" : { - "operationId" : "route112", + "operationId" : "route4", "consumes" : [ "application/json" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -532,13 +532,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route112" + "x-camelContextId" : "camel-1", + "x-routeId" : "route4" } }, "/v2/loop/updateMicroservicePolicy/{loopName}" : { "post" : { - "operationId" : "route114", + "operationId" : "route6", "consumes" : [ "application/json" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -562,13 +562,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route114" + "x-camelContextId" : "camel-1", + "x-routeId" : "route6" } }, "/v2/loop/updateOperationalPolicies/{loopName}" : { "post" : { - "operationId" : "route113", + "operationId" : "route5", "consumes" : [ "application/json" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -592,13 +592,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route113" + "x-camelContextId" : "camel-1", + "x-routeId" : "route5" } }, "/v2/policyToscaModels" : { "get" : { - "operationId" : "route134", + "operationId" : "route26", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -608,11 +608,11 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route134" + "x-camelContextId" : "camel-1", + "x-routeId" : "route26" }, "post" : { - "operationId" : "route137", + "operationId" : "route29", "consumes" : [ "plain/text" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -631,13 +631,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route137" + "x-camelContextId" : "camel-1", + "x-routeId" : "route29" } }, "/v2/policyToscaModels/{policyModelType}/{policyModelVersion}" : { "get" : { - "operationId" : "route135", + "operationId" : "route27", "produces" : [ "application/json" ], "parameters" : [ { "name" : "policyModelType", @@ -658,11 +658,11 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route135" + "x-camelContextId" : "camel-1", + "x-routeId" : "route27" }, "put" : { - "operationId" : "route138", + "operationId" : "route30", "consumes" : [ "plain/text" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -691,13 +691,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route138" + "x-camelContextId" : "camel-1", + "x-routeId" : "route30" } }, "/v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}" : { "get" : { - "operationId" : "route136", + "operationId" : "route28", "produces" : [ "application/json" ], "parameters" : [ { "name" : "policyModelType", @@ -718,13 +718,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route136" + "x-camelContextId" : "camel-1", + "x-routeId" : "route28" } }, "/v2/templates" : { "get" : { - "operationId" : "route139", + "operationId" : "route31", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -734,13 +734,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route139" + "x-camelContextId" : "camel-1", + "x-routeId" : "route31" } }, "/v2/templates/{templateName}" : { "get" : { - "operationId" : "route140", + "operationId" : "route32", "produces" : [ "application/json" ], "parameters" : [ { "name" : "templateName", @@ -756,13 +756,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route140" + "x-camelContextId" : "camel-1", + "x-routeId" : "route32" } }, "/v2/templates/names" : { "get" : { - "operationId" : "route141", + "operationId" : "route33", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -775,13 +775,13 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route141" + "x-camelContextId" : "camel-1", + "x-routeId" : "route33" } }, "/v1/healthcheck" : { "get" : { - "operationId" : "route143", + "operationId" : "route35", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -791,19 +791,19 @@ } } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route143" + "x-camelContextId" : "camel-1", + "x-routeId" : "route35" } }, "/v1/user/getUser" : { "get" : { - "operationId" : "route144", + "operationId" : "route36", "produces" : [ "text/plain" ], "responses" : { "200" : { } }, - "x-camelContextId" : "camel-4", - "x-routeId" : "route144" + "x-camelContextId" : "camel-1", + "x-routeId" : "route36" } } }, @@ -988,36 +988,25 @@ "asBoolean" : { "type" : "boolean" }, - "number" : { - "type" : "boolean" - }, - "asString" : { - "type" : "string" - }, - "asNumber" : { - "$ref" : "#/definitions/Number" + "asInt" : { + "type" : "integer", + "format" : "int32" }, "asDouble" : { "type" : "number", "format" : "double" }, - "asFloat" : { - "type" : "number", - "format" : "float" - }, "asLong" : { "type" : "integer", "format" : "int64" }, - "asInt" : { - "type" : "integer", - "format" : "int32" + "boolean" : { + "type" : "boolean" }, - "asByte" : { - "type" : "string", - "format" : "byte" + "number" : { + "type" : "boolean" }, - "asCharacter" : { + "asString" : { "type" : "string" }, "asBigDecimal" : { @@ -1030,35 +1019,46 @@ "type" : "integer", "format" : "int32" }, - "boolean" : { - "type" : "boolean" + "asNumber" : { + "$ref" : "#/definitions/Number" + }, + "asFloat" : { + "type" : "number", + "format" : "float" + }, + "asByte" : { + "type" : "string", + "format" : "byte" + }, + "asCharacter" : { + "type" : "string" }, "string" : { "type" : "boolean" }, - "jsonArray" : { - "type" : "boolean" + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" }, "jsonObject" : { "type" : "boolean" }, - "jsonPrimitive" : { + "asJsonArray" : { + "$ref" : "#/definitions/JsonArray" + }, + "jsonArray" : { "type" : "boolean" }, "jsonNull" : { "type" : "boolean" }, - "asJsonArray" : { - "$ref" : "#/definitions/JsonArray" - }, "asJsonPrimitive" : { "$ref" : "#/definitions/JsonPrimitive" }, "asJsonNull" : { "$ref" : "#/definitions/JsonNull" }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" + "jsonPrimitive" : { + "type" : "boolean" } } }, @@ -1124,9 +1124,6 @@ }, "dcaeBlueprintId" : { "type" : "string" - }, - "legacy" : { - "type" : "boolean" } }, "x-className" : { @@ -1140,49 +1137,47 @@ "asBoolean" : { "type" : "boolean" }, - "asString" : { - "type" : "string" + "asInt" : { + "type" : "integer", + "format" : "int32" }, - "jsonArray" : { - "type" : "boolean" + "asDouble" : { + "type" : "number", + "format" : "double" }, - "jsonObject" : { - "type" : "boolean" + "asLong" : { + "type" : "integer", + "format" : "int64" }, - "jsonPrimitive" : { - "type" : "boolean" + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" }, - "jsonNull" : { + "asString" : { + "type" : "string" + }, + "jsonObject" : { "type" : "boolean" }, "asJsonArray" : { "$ref" : "#/definitions/JsonArray" }, - "asJsonPrimitive" : { - "$ref" : "#/definitions/JsonPrimitive" + "asBigDecimal" : { + "type" : "number" }, - "asJsonNull" : { - "$ref" : "#/definitions/JsonNull" + "asBigInteger" : { + "type" : "integer" + }, + "asShort" : { + "type" : "integer", + "format" : "int32" }, "asNumber" : { "$ref" : "#/definitions/Number" }, - "asDouble" : { - "type" : "number", - "format" : "double" - }, "asFloat" : { "type" : "number", "format" : "float" }, - "asLong" : { - "type" : "integer", - "format" : "int64" - }, - "asInt" : { - "type" : "integer", - "format" : "int32" - }, "asByte" : { "type" : "string", "format" : "byte" @@ -1190,18 +1185,20 @@ "asCharacter" : { "type" : "string" }, - "asBigDecimal" : { - "type" : "number" + "jsonArray" : { + "type" : "boolean" }, - "asBigInteger" : { - "type" : "integer" + "jsonNull" : { + "type" : "boolean" }, - "asShort" : { - "type" : "integer", - "format" : "int32" + "asJsonPrimitive" : { + "$ref" : "#/definitions/JsonPrimitive" }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" + "asJsonNull" : { + "$ref" : "#/definitions/JsonNull" + }, + "jsonPrimitive" : { + "type" : "boolean" } }, "x-className" : { @@ -1329,9 +1326,6 @@ }, "loop" : { "$ref" : "#/definitions/Loop" - }, - "legacy" : { - "type" : "boolean" } } }, @@ -1341,49 +1335,47 @@ "asBoolean" : { "type" : "boolean" }, - "asString" : { - "type" : "string" + "asInt" : { + "type" : "integer", + "format" : "int32" }, - "jsonArray" : { - "type" : "boolean" + "asDouble" : { + "type" : "number", + "format" : "double" }, - "jsonObject" : { - "type" : "boolean" + "asLong" : { + "type" : "integer", + "format" : "int64" }, - "jsonPrimitive" : { - "type" : "boolean" + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" }, - "jsonNull" : { + "asString" : { + "type" : "string" + }, + "jsonObject" : { "type" : "boolean" }, "asJsonArray" : { "$ref" : "#/definitions/JsonArray" }, - "asJsonPrimitive" : { - "$ref" : "#/definitions/JsonPrimitive" + "asBigDecimal" : { + "type" : "number" }, - "asJsonNull" : { - "$ref" : "#/definitions/JsonNull" + "asBigInteger" : { + "type" : "integer" + }, + "asShort" : { + "type" : "integer", + "format" : "int32" }, "asNumber" : { "$ref" : "#/definitions/Number" }, - "asDouble" : { - "type" : "number", - "format" : "double" - }, "asFloat" : { "type" : "number", "format" : "float" }, - "asLong" : { - "type" : "integer", - "format" : "int64" - }, - "asInt" : { - "type" : "integer", - "format" : "int32" - }, "asByte" : { "type" : "string", "format" : "byte" @@ -1391,18 +1383,20 @@ "asCharacter" : { "type" : "string" }, - "asBigDecimal" : { - "type" : "number" + "jsonArray" : { + "type" : "boolean" }, - "asBigInteger" : { - "type" : "integer" + "jsonNull" : { + "type" : "boolean" }, - "asShort" : { - "type" : "integer", - "format" : "int32" + "asJsonPrimitive" : { + "$ref" : "#/definitions/JsonPrimitive" }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" + "asJsonNull" : { + "$ref" : "#/definitions/JsonNull" + }, + "jsonPrimitive" : { + "type" : "boolean" } } }, @@ -1412,33 +1406,19 @@ "asBoolean" : { "type" : "boolean" }, - "asString" : { - "type" : "string" - }, - "asNumber" : { - "$ref" : "#/definitions/Number" + "asInt" : { + "type" : "integer", + "format" : "int32" }, "asDouble" : { "type" : "number", "format" : "double" }, - "asFloat" : { - "type" : "number", - "format" : "float" - }, "asLong" : { "type" : "integer", "format" : "int64" }, - "asInt" : { - "type" : "integer", - "format" : "int32" - }, - "asByte" : { - "type" : "string", - "format" : "byte" - }, - "asCharacter" : { + "asString" : { "type" : "string" }, "asBigDecimal" : { @@ -1451,29 +1431,43 @@ "type" : "integer", "format" : "int32" }, - "jsonArray" : { - "type" : "boolean" + "asNumber" : { + "$ref" : "#/definitions/Number" + }, + "asFloat" : { + "type" : "number", + "format" : "float" + }, + "asByte" : { + "type" : "string", + "format" : "byte" + }, + "asCharacter" : { + "type" : "string" + }, + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" }, "jsonObject" : { "type" : "boolean" }, - "jsonPrimitive" : { + "asJsonArray" : { + "$ref" : "#/definitions/JsonArray" + }, + "jsonArray" : { "type" : "boolean" }, "jsonNull" : { "type" : "boolean" }, - "asJsonArray" : { - "$ref" : "#/definitions/JsonArray" - }, "asJsonPrimitive" : { "$ref" : "#/definitions/JsonPrimitive" }, "asJsonNull" : { "$ref" : "#/definitions/JsonNull" }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" + "jsonPrimitive" : { + "type" : "boolean" } }, "x-className" : { diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf index abf70b8b2..02b3dc4cc 100644 --- a/docs/swagger/swagger.pdf +++ b/docs/swagger/swagger.pdf @@ -4,16 +4,16 @@ << /Title (Clamp Rest API) /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0) -/CreationDate (D:20200803152317+02'00') -/ModDate (D:20200803152317+02'00') +/CreationDate (D:20201009181937+02'00') +/ModDate (D:20201009181937+02'00') >> endobj 2 0 obj << /Type /Catalog /Pages 3 0 R /Names 22 0 R -/Outlines 676 0 R -/PageLabels 842 0 R +/Outlines 677 0 R +/PageLabels 843 0 R /PageMode /UseOutlines /OpenAction [7 0 R /FitH 793.0] /ViewerPreferences << /DisplayDocTitle true @@ -23,7 +23,7 @@ endobj 3 0 obj << /Type /Pages /Count 38 -/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 20 0 R 29 0 R 45 0 R 61 0 R 75 0 R 87 0 R 98 0 R 110 0 R 124 0 R 134 0 R 144 0 R 159 0 R 173 0 R 187 0 R 201 0 R 214 0 R 225 0 R 237 0 R 246 0 R 253 0 R 259 0 R 266 0 R 272 0 R 280 0 R 287 0 R 295 0 R 303 0 R 310 0 R 317 0 R 325 0 R 334 0 R 342 0 R] +/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 20 0 R 29 0 R 45 0 R 61 0 R 75 0 R 87 0 R 98 0 R 110 0 R 123 0 R 134 0 R 144 0 R 159 0 R 173 0 R 186 0 R 199 0 R 214 0 R 225 0 R 238 0 R 247 0 R 254 0 R 260 0 R 267 0 R 273 0 R 281 0 R 288 0 R 296 0 R 304 0 R 311 0 R 318 0 R 326 0 R 336 0 R 343 0 R] >> endobj 4 0 obj @@ -80,11 +80,11 @@ endobj << /Type /Font /BaseFont /AAAAAA+NotoSerif /Subtype /TrueType -/FontDescriptor 844 0 R +/FontDescriptor 845 0 R /FirstChar 32 /LastChar 255 -/Widths 846 0 R -/ToUnicode 845 0 R +/Widths 847 0 R +/ToUnicode 846 0 R >> endobj 9 0 obj @@ -1559,7 +1559,7 @@ endobj /F1.0 8 0 R >> >> -/Annots [347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R 378 0 R 379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R] +/Annots [348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R 378 0 R 379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R] >> endobj 11 0 obj @@ -3062,7 +3062,7 @@ endobj /Font << /F1.0 8 0 R >> >> -/Annots [419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 494 0 R] +/Annots [420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 495 0 R] >> endobj 13 0 obj @@ -4576,7 +4576,7 @@ endobj /Font << /F1.0 8 0 R >> >> -/Annots [493 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R] +/Annots [494 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R] >> endobj 15 0 obj @@ -6119,7 +6119,7 @@ endobj /Font << /F1.0 8 0 R >> >> -/Annots [569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R 609 0 R 610 0 R 611 0 R 612 0 R 613 0 R 614 0 R 615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 621 0 R 622 0 R 623 0 R 624 0 R 625 0 R 626 0 R 627 0 R 628 0 R 629 0 R 630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 640 0 R 641 0 R 642 0 R 643 0 R 644 0 R] +/Annots [570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R 609 0 R 610 0 R 611 0 R 612 0 R 613 0 R 614 0 R 615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 621 0 R 622 0 R 623 0 R 624 0 R 625 0 R 626 0 R 627 0 R 628 0 R 629 0 R 630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 640 0 R 641 0 R 642 0 R 643 0 R 644 0 R 645 0 R] >> endobj 17 0 obj @@ -6742,11 +6742,11 @@ endobj /Font << /F1.0 8 0 R >> >> -/Annots [645 0 R 646 0 R 647 0 R 648 0 R 649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 654 0 R 655 0 R 656 0 R 657 0 R 658 0 R 659 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R 665 0 R 666 0 R 667 0 R 668 0 R 669 0 R 670 0 R 671 0 R 672 0 R 673 0 R 674 0 R] +/Annots [646 0 R 647 0 R 648 0 R 649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 654 0 R 655 0 R 656 0 R 657 0 R 658 0 R 659 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R 665 0 R 666 0 R 667 0 R 668 0 R 669 0 R 670 0 R 671 0 R 672 0 R 673 0 R 674 0 R 675 0 R] >> endobj 19 0 obj -<< /Length 2379 +<< /Length 2377 >> stream q @@ -6791,7 +6791,7 @@ ET BT 85.136384765625 660.036 Td /F1.0 10.5 Tf -[<203a20352e312e302d534e415053484f> 20.01953125 <54>] TJ +[<203a20352e312e332d534e415053484f> 20.01953125 <54>] TJ ET 0.000 0.000 0.000 SCN @@ -6824,7 +6824,7 @@ ET BT 71.30850000000001 592.176 Td /F1.0 10.5 Tf -<203a206c6f63616c686f73743a3433303635> Tj +<203a206c6f63616c686f73743a38343433> Tj ET 0.000 0.000 0.000 SCN @@ -6925,7 +6925,7 @@ endobj /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> >> @@ -6939,18 +6939,18 @@ endobj >> endobj 23 0 obj -<< /Kids [56 0 R 257 0 R 319 0 R 155 0 R 241 0 R 90 0 R 152 0 R 221 0 R 57 0 R 189 0 R 116 0 R 183 0 R 84 0 R] +<< /Kids [56 0 R 258 0 R 320 0 R 155 0 R 242 0 R 90 0 R 152 0 R 221 0 R 57 0 R 201 0 R 125 0 R 236 0 R 84 0 R 206 0 R] >> endobj 24 0 obj << /Type /Font /BaseFont /AAAAAB+NotoSerif-Bold /Subtype /TrueType -/FontDescriptor 848 0 R +/FontDescriptor 849 0 R /FirstChar 32 /LastChar 255 -/Widths 850 0 R -/ToUnicode 849 0 R +/Widths 851 0 R +/ToUnicode 850 0 R >> endobj 25 0 obj @@ -6960,11 +6960,11 @@ endobj << /Type /Font /BaseFont /AAAAAC+NotoSerif-Italic /Subtype /TrueType -/FontDescriptor 852 0 R +/FontDescriptor 853 0 R /FirstChar 32 /LastChar 255 -/Widths 854 0 R -/ToUnicode 853 0 R +/Widths 855 0 R +/ToUnicode 854 0 R >> endobj 27 0 obj @@ -7864,7 +7864,7 @@ endobj /F1.0 8 0 R /F4.0 35 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> /Annots [33 0 R 41 0 R] @@ -7894,11 +7894,11 @@ endobj << /Type /Font /BaseFont /AAAAAD+mplus1mn-regular /Subtype /TrueType -/FontDescriptor 856 0 R +/FontDescriptor 857 0 R /FirstChar 32 /LastChar 255 -/Widths 858 0 R -/ToUnicode 857 0 R +/Widths 859 0 R +/ToUnicode 858 0 R >> endobj 36 0 obj @@ -9142,7 +9142,7 @@ endobj /F4.0 35 0 R /F3.0 26 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> /Annots [47 0 R 51 0 R 53 0 R] @@ -9195,12 +9195,12 @@ endobj endobj 56 0 obj << /Limits [(_clampinformation) (_consumes_8)] -/Names [(_clampinformation) 248 0 R (_cldshealthcheck) 249 0 R (_consumes) 54 0 R (_consumes_2) 73 0 R (_consumes_3) 100 0 R (_consumes_4) 171 0 R (_consumes_5) 180 0 R (_consumes_6) 191 0 R (_consumes_7) 204 0 R (_consumes_8) 228 0 R] +/Names [(_clampinformation) 249 0 R (_cldshealthcheck) 250 0 R (_consumes) 54 0 R (_consumes_2) 73 0 R (_consumes_3) 100 0 R (_consumes_4) 171 0 R (_consumes_5) 180 0 R (_consumes_6) 189 0 R (_consumes_7) 203 0 R (_consumes_8) 228 0 R] >> endobj 57 0 obj << /Limits [(_responses_10) (_responses_19)] -/Names [(_responses_10) 83 0 R (_responses_11) 91 0 R (_responses_12) 96 0 R (_responses_13) 104 0 R (_responses_14) 107 0 R (_responses_15) 113 0 R (_responses_16) 118 0 R (_responses_17) 125 0 R (_responses_18) 130 0 R (_responses_19) 137 0 R] +/Names [(_responses_10) 83 0 R (_responses_11) 91 0 R (_responses_12) 96 0 R (_responses_13) 104 0 R (_responses_14) 107 0 R (_responses_15) 113 0 R (_responses_16) 117 0 R (_responses_17) 124 0 R (_responses_18) 130 0 R (_responses_19) 137 0 R] >> endobj 58 0 obj @@ -10555,7 +10555,7 @@ endobj /F4.0 35 0 R /F3.0 26 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> /Annots [66 0 R 70 0 R 72 0 R] @@ -11775,7 +11775,7 @@ endobj /F4.0 35 0 R /F3.0 26 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> >> @@ -11805,8 +11805,8 @@ endobj [75 0 R /XYZ 0 198.9600000000004 null] endobj 84 0 obj -<< /Limits [(_route128) (_version_information)] -/Names [(_route128) 58 0 R (_route129) 63 0 R (_route130) 49 0 R (_route131) 68 0 R (_route132) 77 0 R (_route133) 81 0 R (_route134) 206 0 R (_route135) 216 0 R (_route136) 210 0 R (_route137) 198 0 R (_route138) 222 0 R (_route139) 230 0 R (_route140) 239 0 R (_route141) 234 0 R (_route142) 39 0 R (_route143) 31 0 R (_route144) 36 0 R (_service) 344 0 R (_uri_scheme) 27 0 R (_version_information) 25 0 R] +<< /Limits [(_route2) (_route3)] +/Names [(_route2) 112 0 R (_route20) 58 0 R (_route21) 63 0 R (_route22) 49 0 R (_route23) 68 0 R (_route24) 77 0 R (_route25) 81 0 R (_route26) 205 0 R (_route27) 216 0 R (_route28) 210 0 R (_route29) 196 0 R (_route3) 191 0 R] >> endobj 85 0 obj @@ -13007,7 +13007,7 @@ endobj /F1.0 8 0 R /F4.0 35 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> /Annots [92 0 R] @@ -13021,7 +13021,7 @@ endobj endobj 90 0 obj << /Limits [(_policymodel) (_produces_18)] -/Names [(_policymodel) 339 0 R (_produces) 34 0 R (_produces_10) 85 0 R (_produces_11) 93 0 R (_produces_12) 101 0 R (_produces_13) 111 0 R (_produces_14) 114 0 R (_produces_15) 120 0 R (_produces_16) 127 0 R (_produces_17) 132 0 R (_produces_18) 139 0 R] +/Names [(_policymodel) 340 0 R (_produces) 34 0 R (_produces_10) 85 0 R (_produces_11) 93 0 R (_produces_12) 101 0 R (_produces_13) 111 0 R (_produces_14) 114 0 R (_produces_15) 119 0 R (_produces_16) 127 0 R (_produces_17) 132 0 R (_produces_18) 139 0 R] >> endobj 91 0 obj @@ -14375,7 +14375,7 @@ endobj /F4.0 35 0 R /F3.0 26 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> /Annots [99 0 R 108 0 R] @@ -15409,10 +15409,10 @@ endobj /F4.0 35 0 R /F3.0 26 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [119 0 R] +/Annots [118 0 R] >> endobj 111 0 obj @@ -15431,17 +15431,12 @@ endobj [110 0 R /XYZ 0 500.64000000000044 null] endobj 116 0 obj -<< /Limits [(_responses_6) (_route116)] -/Names [(_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 71 0 R (_responses_9) 79 0 R (_route110) 112 0 R (_route111) 193 0 R (_route112) 166 0 R (_route113) 182 0 R (_route114) 175 0 R (_route115) 105 0 R (_route116) 121 0 R] ->> -endobj -117 0 obj [110 0 R /XYZ 0 460.5600000000004 null] endobj -118 0 obj +117 0 obj [110 0 R /XYZ 0 355.44000000000034 null] endobj -119 0 obj +118 0 obj << /Border [0 0 0] /Dest (_loop) /Subtype /Link @@ -15449,16 +15444,16 @@ endobj /Type /Annot >> endobj -120 0 obj +119 0 obj [110 0 R /XYZ 0 250.32000000000028 null] endobj -121 0 obj +120 0 obj [110 0 R /XYZ 0 194.04000000000025 null] endobj -122 0 obj +121 0 obj [110 0 R /XYZ 0 97.80000000000024 null] endobj -123 0 obj +122 0 obj << /Length 19092 >> stream @@ -16877,25 +16872,30 @@ Q endstream endobj -124 0 obj +123 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 123 0 R +/Contents 122 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R /F4.0 35 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> /Annots [126 0 R 131 0 R] >> endobj +124 0 obj +[123 0 R /XYZ 0 645.5999999999999 null] +endobj 125 0 obj -[124 0 R /XYZ 0 645.5999999999999 null] +<< /Limits [(_responses_30) (_responses_8)] +/Names [(_responses_30) 212 0 R (_responses_31) 218 0 R (_responses_32) 226 0 R (_responses_33) 231 0 R (_responses_34) 235 0 R (_responses_35) 243 0 R (_responses_4) 46 0 R (_responses_5) 52 0 R (_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 71 0 R] +>> endobj 126 0 obj << /Border [0 0 0] @@ -16906,16 +16906,16 @@ endobj >> endobj 127 0 obj -[124 0 R /XYZ 0 540.48 null] +[123 0 R /XYZ 0 540.48 null] endobj 128 0 obj -[124 0 R /XYZ 0 484.20000000000016 null] +[123 0 R /XYZ 0 484.20000000000016 null] endobj 129 0 obj -[124 0 R /XYZ 0 387.96000000000015 null] +[123 0 R /XYZ 0 387.96000000000015 null] endobj 130 0 obj -[124 0 R /XYZ 0 245.28000000000014 null] +[123 0 R /XYZ 0 245.28000000000014 null] endobj 131 0 obj << /Border [0 0 0] @@ -16926,7 +16926,7 @@ endobj >> endobj 132 0 obj -[124 0 R /XYZ 0 140.1600000000001 null] +[123 0 R /XYZ 0 140.1600000000001 null] endobj 133 0 obj << /Length 17251 @@ -18223,7 +18223,7 @@ endobj /F1.0 8 0 R /F4.0 35 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> /Annots [138 0 R] @@ -19679,7 +19679,7 @@ endobj /F4.0 35 0 R /F3.0 26 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> /Annots [145 0 R 150 0 R 157 0 R] @@ -19718,7 +19718,7 @@ endobj endobj 152 0 obj << /Limits [(_produces_19) (_produces_27)] -/Names [(_produces_19) 146 0 R (_produces_2) 38 0 R (_produces_20) 151 0 R (_produces_21) 160 0 R (_produces_22) 165 0 R (_produces_23) 174 0 R (_produces_24) 181 0 R (_produces_25) 192 0 R (_produces_26) 197 0 R (_produces_27) 205 0 R] +/Names [(_produces_19) 146 0 R (_produces_2) 38 0 R (_produces_20) 151 0 R (_produces_21) 160 0 R (_produces_22) 165 0 R (_produces_23) 174 0 R (_produces_24) 181 0 R (_produces_25) 190 0 R (_produces_26) 195 0 R (_produces_27) 204 0 R] >> endobj 153 0 obj @@ -19729,7 +19729,7 @@ endobj endobj 155 0 obj << /Limits [(_parameters_15) (_parameters_23)] -/Names [(_parameters_15) 148 0 R (_parameters_16) 154 0 R (_parameters_17) 162 0 R (_parameters_18) 167 0 R (_parameters_19) 176 0 R (_parameters_2) 64 0 R (_parameters_20) 184 0 R (_parameters_21) 194 0 R (_parameters_22) 199 0 R (_parameters_23) 211 0 R] +/Names [(_parameters_15) 148 0 R (_parameters_16) 154 0 R (_parameters_17) 162 0 R (_parameters_18) 167 0 R (_parameters_19) 176 0 R (_parameters_2) 64 0 R (_parameters_20) 183 0 R (_parameters_21) 192 0 R (_parameters_22) 197 0 R (_parameters_23) 211 0 R] >> endobj 156 0 obj @@ -21089,7 +21089,7 @@ endobj /F4.0 35 0 R /F3.0 26 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> /Annots [164 0 R 168 0 R 170 0 R] @@ -22391,10 +22391,10 @@ endobj /F4.0 35 0 R /F3.0 26 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [177 0 R 179 0 R 185 0 R] +/Annots [177 0 R 179 0 R 184 0 R] >> endobj 174 0 obj @@ -22435,14 +22435,9 @@ endobj [173 0 R /XYZ 0 273.60000000000014 null] endobj 183 0 obj -<< /Limits [(_route117) (_route127)] -/Names [(_route117) 128 0 R (_route118) 161 0 R (_route119) 147 0 R (_route120) 140 0 R (_route121) 153 0 R (_route122) 102 0 R (_route123) 115 0 R (_route124) 88 0 R (_route125) 135 0 R (_route126) 94 0 R (_route127) 43 0 R] ->> -endobj -184 0 obj [173 0 R /XYZ 0 205.44000000000014 null] endobj -185 0 obj +184 0 obj << /Border [0 0 0] /Dest (_jsonarray) /Subtype /Link @@ -22450,7 +22445,7 @@ endobj /Type /Annot >> endobj -186 0 obj +185 0 obj << /Length 16279 >> stream @@ -23648,32 +23643,27 @@ Q endstream endobj -187 0 obj +186 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 186 0 R +/Contents 185 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F1.0 8 0 R /F4.0 35 0 R /F3.0 26 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [190 0 R 196 0 R] +/Annots [188 0 R 194 0 R] >> endobj -188 0 obj -[187 0 R /XYZ 0 792.0 null] -endobj -189 0 obj -<< /Limits [(_responses_2) (_responses_5)] -/Names [(_responses_2) 37 0 R (_responses_20) 142 0 R (_responses_21) 149 0 R (_responses_22) 156 0 R (_responses_23) 163 0 R (_responses_24) 169 0 R (_responses_25) 178 0 R (_responses_26) 188 0 R (_responses_27) 195 0 R (_responses_28) 202 0 R (_responses_29) 207 0 R (_responses_3) 40 0 R (_responses_30) 212 0 R (_responses_31) 218 0 R (_responses_32) 226 0 R (_responses_33) 231 0 R (_responses_34) 235 0 R (_responses_35) 242 0 R (_responses_4) 46 0 R (_responses_5) 52 0 R] ->> +187 0 obj +[186 0 R /XYZ 0 792.0 null] endobj -190 0 obj +188 0 obj << /Border [0 0 0] /Dest (_loop) /Subtype /Link @@ -23681,22 +23671,22 @@ endobj /Type /Annot >> endobj +189 0 obj +[186 0 R /XYZ 0 653.2800000000002 null] +endobj +190 0 obj +[186 0 R /XYZ 0 597.0000000000003 null] +endobj 191 0 obj -[187 0 R /XYZ 0 653.2800000000002 null] +[186 0 R /XYZ 0 540.7200000000005 null] endobj 192 0 obj -[187 0 R /XYZ 0 597.0000000000003 null] +[186 0 R /XYZ 0 500.6400000000005 null] endobj 193 0 obj -[187 0 R /XYZ 0 540.7200000000005 null] +[186 0 R /XYZ 0 395.5200000000005 null] endobj 194 0 obj -[187 0 R /XYZ 0 500.6400000000005 null] -endobj -195 0 obj -[187 0 R /XYZ 0 395.5200000000005 null] -endobj -196 0 obj << /Border [0 0 0] /Dest (_loop) /Subtype /Link @@ -23704,16 +23694,16 @@ endobj /Type /Annot >> endobj -197 0 obj -[187 0 R /XYZ 0 290.40000000000043 null] +195 0 obj +[186 0 R /XYZ 0 290.40000000000043 null] endobj -198 0 obj -[187 0 R /XYZ 0 234.1200000000004 null] +196 0 obj +[186 0 R /XYZ 0 234.1200000000004 null] endobj -199 0 obj -[187 0 R /XYZ 0 194.0400000000004 null] +197 0 obj +[186 0 R /XYZ 0 194.0400000000004 null] endobj -200 0 obj +198 0 obj << /Length 15184 >> stream @@ -24816,27 +24806,32 @@ Q endstream endobj -201 0 obj +199 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 200 0 R +/Contents 198 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F1.0 8 0 R /F4.0 35 0 R /F3.0 26 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [203 0 R 208 0 R] +/Annots [202 0 R 208 0 R] >> endobj -202 0 obj -[201 0 R /XYZ 0 792.0 null] +200 0 obj +[199 0 R /XYZ 0 792.0 null] endobj -203 0 obj +201 0 obj +<< /Limits [(_responses_2) (_responses_3)] +/Names [(_responses_2) 37 0 R (_responses_20) 142 0 R (_responses_21) 149 0 R (_responses_22) 156 0 R (_responses_23) 163 0 R (_responses_24) 169 0 R (_responses_25) 178 0 R (_responses_26) 187 0 R (_responses_27) 193 0 R (_responses_28) 200 0 R (_responses_29) 207 0 R (_responses_3) 40 0 R] +>> +endobj +202 0 obj << /Border [0 0 0] /Dest (_policymodel) /Subtype /Link @@ -24844,17 +24839,22 @@ endobj /Type /Annot >> endobj +203 0 obj +[199 0 R /XYZ 0 653.2800000000002 null] +endobj 204 0 obj -[201 0 R /XYZ 0 653.2800000000002 null] +[199 0 R /XYZ 0 597.0000000000003 null] endobj 205 0 obj -[201 0 R /XYZ 0 597.0000000000003 null] +[199 0 R /XYZ 0 540.7200000000005 null] endobj 206 0 obj -[201 0 R /XYZ 0 540.7200000000005 null] +<< /Limits [(_route30) (_version_information)] +/Names [(_route30) 222 0 R (_route31) 230 0 R (_route32) 240 0 R (_route33) 234 0 R (_route34) 39 0 R (_route35) 31 0 R (_route36) 36 0 R (_route4) 166 0 R (_route5) 182 0 R (_route6) 175 0 R (_route7) 105 0 R (_route8) 120 0 R (_route9) 128 0 R (_service) 345 0 R (_uri_scheme) 27 0 R (_version_information) 25 0 R] +>> endobj 207 0 obj -[201 0 R /XYZ 0 500.6400000000005 null] +[199 0 R /XYZ 0 500.6400000000005 null] endobj 208 0 obj << /Border [0 0 0] @@ -24865,16 +24865,16 @@ endobj >> endobj 209 0 obj -[201 0 R /XYZ 0 395.52000000000044 null] +[199 0 R /XYZ 0 395.52000000000044 null] endobj 210 0 obj -[201 0 R /XYZ 0 339.2400000000004 null] +[199 0 R /XYZ 0 339.2400000000004 null] endobj 211 0 obj -[201 0 R /XYZ 0 243.00000000000043 null] +[199 0 R /XYZ 0 243.00000000000043 null] endobj 212 0 obj -[201 0 R /XYZ 0 100.32000000000039 null] +[199 0 R /XYZ 0 100.32000000000039 null] endobj 213 0 obj << /Length 14693 @@ -25956,7 +25956,7 @@ endobj /F4.0 35 0 R /F3.0 26 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> /Annots [219 0 R] @@ -25987,7 +25987,7 @@ endobj endobj 221 0 obj << /Limits [(_produces_28) (_responses)] -/Names [(_produces_28) 209 0 R (_produces_29) 215 0 R (_produces_3) 42 0 R (_produces_30) 220 0 R (_produces_31) 229 0 R (_produces_32) 233 0 R (_produces_33) 238 0 R (_produces_34) 244 0 R (_produces_4) 48 0 R (_produces_5) 55 0 R (_produces_6) 62 0 R (_produces_7) 67 0 R (_produces_8) 76 0 R (_produces_9) 80 0 R (_responses) 32 0 R] +/Names [(_produces_28) 209 0 R (_produces_29) 215 0 R (_produces_3) 42 0 R (_produces_30) 220 0 R (_produces_31) 229 0 R (_produces_32) 233 0 R (_produces_33) 239 0 R (_produces_34) 245 0 R (_produces_4) 48 0 R (_produces_5) 55 0 R (_produces_6) 62 0 R (_produces_7) 67 0 R (_produces_8) 76 0 R (_produces_9) 80 0 R (_responses) 32 0 R] >> endobj 222 0 obj @@ -27447,7 +27447,7 @@ endobj /F1.0 8 0 R /F4.0 35 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> /Annots [227 0 R 232 0 R] @@ -27494,6 +27494,11 @@ endobj [225 0 R /XYZ 0 148.79999999999993 null] endobj 236 0 obj +<< /Limits [(_responses_9) (_route19)] +/Names [(_responses_9) 79 0 R (_route10) 161 0 R (_route11) 147 0 R (_route12) 140 0 R (_route13) 153 0 R (_route14) 102 0 R (_route15) 115 0 R (_route16) 88 0 R (_route17) 135 0 R (_route18) 94 0 R (_route19) 43 0 R] +>> +endobj +237 0 obj << /Length 8598 >> stream @@ -28126,41 +28131,41 @@ Q endstream endobj -237 0 obj +238 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 236 0 R +/Contents 237 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F1.0 8 0 R /F4.0 35 0 R /F3.0 26 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [243 0 R] +/Annots [244 0 R] >> endobj -238 0 obj -[237 0 R /XYZ 0 792.0 null] -endobj 239 0 obj -[237 0 R /XYZ 0 702.1200000000001 null] +[238 0 R /XYZ 0 792.0 null] endobj 240 0 obj -[237 0 R /XYZ 0 662.0400000000002 null] +[238 0 R /XYZ 0 702.1200000000001 null] endobj 241 0 obj -<< /Limits [(_parameters_24) (_paths)] -/Names [(_parameters_24) 217 0 R (_parameters_25) 223 0 R (_parameters_26) 240 0 R (_parameters_3) 69 0 R (_parameters_4) 78 0 R (_parameters_5) 82 0 R (_parameters_6) 89 0 R (_parameters_7) 95 0 R (_parameters_8) 103 0 R (_parameters_9) 106 0 R (_paths) 30 0 R] ->> +[238 0 R /XYZ 0 662.0400000000002 null] endobj 242 0 obj -[237 0 R /XYZ 0 556.9200000000003 null] +<< /Limits [(_parameters_24) (_paths)] +/Names [(_parameters_24) 217 0 R (_parameters_25) 223 0 R (_parameters_26) 241 0 R (_parameters_3) 69 0 R (_parameters_4) 78 0 R (_parameters_5) 82 0 R (_parameters_6) 89 0 R (_parameters_7) 95 0 R (_parameters_8) 103 0 R (_parameters_9) 106 0 R (_paths) 30 0 R] +>> endobj 243 0 obj +[238 0 R /XYZ 0 556.9200000000003 null] +endobj +244 0 obj << /Border [0 0 0] /Dest (_looptemplate) /Subtype /Link @@ -28168,10 +28173,10 @@ endobj /Type /Annot >> endobj -244 0 obj -[237 0 R /XYZ 0 451.8000000000004 null] -endobj 245 0 obj +[238 0 R /XYZ 0 451.8000000000004 null] +endobj +246 0 obj << /Length 17145 >> stream @@ -29492,35 +29497,35 @@ Q endstream endobj -246 0 obj +247 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 245 0 R +/Contents 246 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [251 0 R] +/Annots [252 0 R] >> endobj -247 0 obj -[246 0 R /XYZ 0 792.0 null] -endobj 248 0 obj -[246 0 R /XYZ 0 712.0799999999999 null] +[247 0 R /XYZ 0 792.0 null] endobj 249 0 obj -[246 0 R /XYZ 0 524.04 null] +[247 0 R /XYZ 0 712.0799999999999 null] endobj 250 0 obj -[246 0 R /XYZ 0 335.99999999999994 null] +[247 0 R /XYZ 0 524.04 null] endobj 251 0 obj +[247 0 R /XYZ 0 335.99999999999994 null] +endobj +252 0 obj << /Border [0 0 0] /Dest (_dictionaryelement) /Subtype /Link @@ -29528,7 +29533,7 @@ endobj /Type /Annot >> endobj -252 0 obj +253 0 obj << /Length 19851 >> stream @@ -31097,26 +31102,26 @@ Q endstream endobj -253 0 obj +254 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 252 0 R +/Contents 253 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [255 0 R] +/Annots [256 0 R] >> endobj -254 0 obj -[253 0 R /XYZ 0 608.04 null] -endobj 255 0 obj +[254 0 R /XYZ 0 608.04 null] +endobj +256 0 obj << /Border [0 0 0] /Dest (_dictionary) /Subtype /Link @@ -31124,15 +31129,15 @@ endobj /Type /Annot >> endobj -256 0 obj -[253 0 R /XYZ 0 157.07999999999998 null] -endobj 257 0 obj +[254 0 R /XYZ 0 157.07999999999998 null] +endobj +258 0 obj << /Limits [(_definitions) (_loop)] -/Names [(_definitions) 247 0 R (_dictionary) 250 0 R (_dictionaryelement) 254 0 R (_externalcomponent) 256 0 R (_externalcomponentstate) 261 0 R (_jsonarray) 262 0 R (_jsonnull) 270 0 R (_jsonobject) 278 0 R (_jsonprimitive) 288 0 R (_loop) 296 0 R] +/Names [(_definitions) 248 0 R (_dictionary) 251 0 R (_dictionaryelement) 255 0 R (_externalcomponent) 257 0 R (_externalcomponentstate) 262 0 R (_jsonarray) 263 0 R (_jsonnull) 271 0 R (_jsonobject) 279 0 R (_jsonprimitive) 289 0 R (_loop) 297 0 R] >> endobj -258 0 obj +259 0 obj << /Length 20493 >> stream @@ -32703,23 +32708,23 @@ Q endstream endobj -259 0 obj +260 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 258 0 R +/Contents 259 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [260 0 R 263 0 R 264 0 R] +/Annots [261 0 R 264 0 R 265 0 R] >> endobj -260 0 obj +261 0 obj << /Border [0 0 0] /Dest (_externalcomponentstate) /Subtype /Link @@ -32727,13 +32732,13 @@ endobj /Type /Annot >> endobj -261 0 obj -[259 0 R /XYZ 0 683.1600000000001 null] -endobj 262 0 obj -[259 0 R /XYZ 0 495.1200000000002 null] +[260 0 R /XYZ 0 683.1600000000001 null] endobj 263 0 obj +[260 0 R /XYZ 0 495.1200000000002 null] +endobj +264 0 obj << /Border [0 0 0] /Dest (_jsonarray) /Subtype /Link @@ -32741,7 +32746,7 @@ endobj /Type /Annot >> endobj -264 0 obj +265 0 obj << /Border [0 0 0] /Dest (_jsonnull) /Subtype /Link @@ -32749,7 +32754,7 @@ endobj /Type /Annot >> endobj -265 0 obj +266 0 obj << /Length 21348 >> stream @@ -34411,23 +34416,23 @@ Q endstream endobj -266 0 obj +267 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 265 0 R +/Contents 266 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [267 0 R 268 0 R 269 0 R] +/Annots [268 0 R 269 0 R 270 0 R] >> endobj -267 0 obj +268 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link @@ -34435,7 +34440,7 @@ endobj /Type /Annot >> endobj -268 0 obj +269 0 obj << /Border [0 0 0] /Dest (_jsonprimitive) /Subtype /Link @@ -34443,7 +34448,7 @@ endobj /Type /Annot >> endobj -269 0 obj +270 0 obj << /Border [0 0 0] /Dest (_number) /Subtype /Link @@ -34451,10 +34456,10 @@ endobj /Type /Annot >> endobj -270 0 obj -[266 0 R /XYZ 0 345.1200000000003 null] -endobj 271 0 obj +[267 0 R /XYZ 0 345.1200000000003 null] +endobj +272 0 obj << /Length 21776 >> stream @@ -36132,23 +36137,23 @@ Q endstream endobj -272 0 obj +273 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 271 0 R +/Contents 272 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [273 0 R 274 0 R 275 0 R 276 0 R 277 0 R] +/Annots [274 0 R 275 0 R 276 0 R 277 0 R 278 0 R] >> endobj -273 0 obj +274 0 obj << /Border [0 0 0] /Dest (_jsonarray) /Subtype /Link @@ -36156,7 +36161,7 @@ endobj /Type /Annot >> endobj -274 0 obj +275 0 obj << /Border [0 0 0] /Dest (_jsonnull) /Subtype /Link @@ -36164,7 +36169,7 @@ endobj /Type /Annot >> endobj -275 0 obj +276 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link @@ -36172,7 +36177,7 @@ endobj /Type /Annot >> endobj -276 0 obj +277 0 obj << /Border [0 0 0] /Dest (_jsonprimitive) /Subtype /Link @@ -36180,7 +36185,7 @@ endobj /Type /Annot >> endobj -277 0 obj +278 0 obj << /Border [0 0 0] /Dest (_number) /Subtype /Link @@ -36188,10 +36193,10 @@ endobj /Type /Annot >> endobj -278 0 obj -[272 0 R /XYZ 0 194.88000000000017 null] -endobj 279 0 obj +[273 0 R /XYZ 0 194.88000000000017 null] +endobj +280 0 obj << /Length 22905 >> stream @@ -37960,23 +37965,23 @@ Q endstream endobj -280 0 obj +281 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 279 0 R +/Contents 280 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [281 0 R 282 0 R 283 0 R 284 0 R 285 0 R] +/Annots [282 0 R 283 0 R 284 0 R 285 0 R 286 0 R] >> endobj -281 0 obj +282 0 obj << /Border [0 0 0] /Dest (_jsonarray) /Subtype /Link @@ -37984,7 +37989,7 @@ endobj /Type /Annot >> endobj -282 0 obj +283 0 obj << /Border [0 0 0] /Dest (_jsonnull) /Subtype /Link @@ -37992,7 +37997,7 @@ endobj /Type /Annot >> endobj -283 0 obj +284 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link @@ -38000,7 +38005,7 @@ endobj /Type /Annot >> endobj -284 0 obj +285 0 obj << /Border [0 0 0] /Dest (_jsonprimitive) /Subtype /Link @@ -38008,7 +38013,7 @@ endobj /Type /Annot >> endobj -285 0 obj +286 0 obj << /Border [0 0 0] /Dest (_number) /Subtype /Link @@ -38016,7 +38021,7 @@ endobj /Type /Annot >> endobj -286 0 obj +287 0 obj << /Length 21594 >> stream @@ -39706,26 +39711,26 @@ Q endstream endobj -287 0 obj +288 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 286 0 R +/Contents 287 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [289 0 R 290 0 R 291 0 R 292 0 R 293 0 R] +/Annots [290 0 R 291 0 R 292 0 R 293 0 R 294 0 R] >> endobj -288 0 obj -[287 0 R /XYZ 0 792.0 null] -endobj 289 0 obj +[288 0 R /XYZ 0 792.0 null] +endobj +290 0 obj << /Border [0 0 0] /Dest (_jsonarray) /Subtype /Link @@ -39733,7 +39738,7 @@ endobj /Type /Annot >> endobj -290 0 obj +291 0 obj << /Border [0 0 0] /Dest (_jsonnull) /Subtype /Link @@ -39741,7 +39746,7 @@ endobj /Type /Annot >> endobj -291 0 obj +292 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link @@ -39749,7 +39754,7 @@ endobj /Type /Annot >> endobj -292 0 obj +293 0 obj << /Border [0 0 0] /Dest (_jsonprimitive) /Subtype /Link @@ -39757,7 +39762,7 @@ endobj /Type /Annot >> endobj -293 0 obj +294 0 obj << /Border [0 0 0] /Dest (_number) /Subtype /Link @@ -39765,7 +39770,7 @@ endobj /Type /Annot >> endobj -294 0 obj +295 0 obj << /Length 22743 >> stream @@ -41492,26 +41497,26 @@ Q endstream endobj -295 0 obj +296 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 294 0 R +/Contents 295 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [297 0 R 298 0 R 299 0 R 300 0 R 301 0 R] +/Annots [298 0 R 299 0 R 300 0 R 301 0 R 302 0 R] >> endobj -296 0 obj -[295 0 R /XYZ 0 495.3600000000003 null] -endobj 297 0 obj +[296 0 R /XYZ 0 495.3600000000003 null] +endobj +298 0 obj << /Border [0 0 0] /Dest (_externalcomponent) /Subtype /Link @@ -41519,7 +41524,7 @@ endobj /Type /Annot >> endobj -298 0 obj +299 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link @@ -41527,7 +41532,7 @@ endobj /Type /Annot >> endobj -299 0 obj +300 0 obj << /Border [0 0 0] /Dest (_looplog) /Subtype /Link @@ -41535,7 +41540,7 @@ endobj /Type /Annot >> endobj -300 0 obj +301 0 obj << /Border [0 0 0] /Dest (_looptemplate) /Subtype /Link @@ -41543,7 +41548,7 @@ endobj /Type /Annot >> endobj -301 0 obj +302 0 obj << /Border [0 0 0] /Dest (_microservicepolicy) /Subtype /Link @@ -41551,7 +41556,7 @@ endobj /Type /Annot >> endobj -302 0 obj +303 0 obj << /Length 22218 >> stream @@ -43263,23 +43268,23 @@ Q endstream endobj -303 0 obj +304 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 302 0 R +/Contents 303 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [304 0 R 305 0 R 307 0 R 308 0 R] +/Annots [305 0 R 306 0 R 308 0 R 309 0 R] >> endobj -304 0 obj +305 0 obj << /Border [0 0 0] /Dest (_service) /Subtype /Link @@ -43287,7 +43292,7 @@ endobj /Type /Annot >> endobj -305 0 obj +306 0 obj << /Border [0 0 0] /Dest (_operationalpolicy) /Subtype /Link @@ -43295,10 +43300,10 @@ endobj /Type /Annot >> endobj -306 0 obj -[303 0 R /XYZ 0 532.9200000000001 null] -endobj 307 0 obj +[304 0 R /XYZ 0 532.9200000000001 null] +endobj +308 0 obj << /Border [0 0 0] /Dest (_policymodel) /Subtype /Link @@ -43306,7 +43311,7 @@ endobj /Type /Annot >> endobj -308 0 obj +309 0 obj << /Border [0 0 0] /Dest (_looptemplateloopelementmodel) /Subtype /Link @@ -43314,7 +43319,7 @@ endobj /Type /Annot >> endobj -309 0 obj +310 0 obj << /Length 20618 >> stream @@ -44911,26 +44916,26 @@ Q endstream endobj -310 0 obj +311 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 309 0 R +/Contents 310 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [312 0 R 314 0 R 315 0 R] +/Annots [313 0 R 315 0 R 316 0 R] >> endobj -311 0 obj -[310 0 R /XYZ 0 792.0 null] -endobj 312 0 obj +[311 0 R /XYZ 0 792.0 null] +endobj +313 0 obj << /Border [0 0 0] /Dest (_loop) /Subtype /Link @@ -44938,10 +44943,10 @@ endobj /Type /Annot >> endobj -313 0 obj -[310 0 R /XYZ 0 457.68 null] -endobj 314 0 obj +[311 0 R /XYZ 0 457.68 null] +endobj +315 0 obj << /Border [0 0 0] /Dest (_looptemplateloopelementmodel) /Subtype /Link @@ -44949,7 +44954,7 @@ endobj /Type /Annot >> endobj -315 0 obj +316 0 obj << /Border [0 0 0] /Dest (_service) /Subtype /Link @@ -44957,7 +44962,7 @@ endobj /Type /Annot >> endobj -316 0 obj +317 0 obj << /Length 20611 >> stream @@ -46528,31 +46533,31 @@ Q endstream endobj -317 0 obj +318 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 316 0 R +/Contents 317 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [320 0 R 321 0 R 323 0 R] +/Annots [321 0 R 322 0 R 324 0 R] >> endobj -318 0 obj -[317 0 R /XYZ 0 608.0400000000002 null] -endobj 319 0 obj +[318 0 R /XYZ 0 608.0400000000002 null] +endobj +320 0 obj << /Limits [(_loopelementmodel) (_parameters_14)] -/Names [(_loopelementmodel) 306 0 R (_looplog) 311 0 R (_looptemplate) 313 0 R (_looptemplateloopelementmodel) 318 0 R (_microservicepolicy) 322 0 R (_number) 330 0 R (_operationalpolicy) 331 0 R (_overview) 21 0 R (_parameters) 50 0 R (_parameters_10) 117 0 R (_parameters_11) 122 0 R (_parameters_12) 129 0 R (_parameters_13) 136 0 R (_parameters_14) 141 0 R] +/Names [(_loopelementmodel) 307 0 R (_looplog) 312 0 R (_looptemplate) 314 0 R (_looptemplateloopelementmodel) 319 0 R (_microservicepolicy) 323 0 R (_number) 331 0 R (_operationalpolicy) 332 0 R (_overview) 21 0 R (_parameters) 50 0 R (_parameters_10) 116 0 R (_parameters_11) 121 0 R (_parameters_12) 129 0 R (_parameters_13) 136 0 R (_parameters_14) 141 0 R] >> endobj -320 0 obj +321 0 obj << /Border [0 0 0] /Dest (_loopelementmodel) /Subtype /Link @@ -46560,7 +46565,7 @@ endobj /Type /Annot >> endobj -321 0 obj +322 0 obj << /Border [0 0 0] /Dest (_looptemplate) /Subtype /Link @@ -46568,10 +46573,10 @@ endobj /Type /Annot >> endobj -322 0 obj -[317 0 R /XYZ 0 420.0000000000003 null] -endobj 323 0 obj +[318 0 R /XYZ 0 420.0000000000003 null] +endobj +324 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link @@ -46579,8 +46584,8 @@ endobj /Type /Annot >> endobj -324 0 obj -<< /Length 20167 +325 0 obj +<< /Length 20279 >> stream q @@ -46673,14 +46678,6 @@ f 269.177 357.120 294.583 37.560 re f 0.000 0.000 0.000 scn -1.000 1.000 1.000 scn -48.240 319.560 220.937 37.560 re -f -0.000 0.000 0.000 scn -1.000 1.000 1.000 scn -269.177 319.560 294.583 37.560 re -f -0.000 0.000 0.000 scn 0.5 w /DeviceRGB CS 0.867 0.867 0.867 SCN @@ -46873,7 +46870,7 @@ S BT 51.24 678.913 Td /F2.0 10.5 Tf -<6c6567616379> Tj +<6c6f6f70456c656d656e744d6f64656c> Tj ET @@ -46916,13 +46913,21 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN BT 272.17692192000004 671.7729999999999 Td /F1.0 10.5 Tf -<626f6f6c65616e> Tj +<4c6f6f70456c656d656e744d6f64656c> Tj ET +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN @@ -46955,7 +46960,7 @@ S BT 51.24 641.3529999999998 Td /F2.0 10.5 Tf -<6c6f6f70456c656d656e744d6f64656c> Tj +<6e616d65> Tj ET @@ -46998,21 +47003,13 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN BT 272.17692192000004 634.2129999999999 Td /F1.0 10.5 Tf -<4c6f6f70456c656d656e744d6f64656c> Tj +<737472696e67> Tj ET -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN @@ -47045,7 +47042,7 @@ S BT 51.24 603.7929999999999 Td /F2.0 10.5 Tf -<6e616d65> Tj +<70647047726f7570> Tj ET @@ -47127,7 +47124,7 @@ S BT 51.24 566.233 Td /F2.0 10.5 Tf -<70647047726f7570> Tj +<70647053756267726f7570> Tj ET @@ -47209,7 +47206,7 @@ S BT 51.24 528.673 Td /F2.0 10.5 Tf -<70647053756267726f7570> Tj +<706f6c6963794d6f64656c> Tj ET @@ -47252,13 +47249,21 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN BT 272.17692192000004 521.5329999999999 Td /F1.0 10.5 Tf -<737472696e67> Tj +<506f6c6963794d6f64656c> Tj ET +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN @@ -47291,7 +47296,7 @@ S BT 51.24 491.1129999999999 Td /F2.0 10.5 Tf -<706f6c6963794d6f64656c> Tj +<736861726564> Tj ET @@ -47334,21 +47339,13 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN BT 272.17692192000004 483.9729999999999 Td /F1.0 10.5 Tf -<506f6c6963794d6f64656c> Tj +<626f6f6c65616e> Tj ET -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN @@ -47381,7 +47378,7 @@ S BT 51.24 453.55299999999994 Td /F2.0 10.5 Tf -<736861726564> Tj +[<7570646174656442> 20.01953125 <79>] TJ ET @@ -47428,7 +47425,7 @@ S BT 272.17692192000004 446.41299999999995 Td /F1.0 10.5 Tf -<626f6f6c65616e> Tj +<737472696e67> Tj ET 0.000 0.000 0.000 scn @@ -47463,7 +47460,7 @@ S BT 51.24 415.993 Td /F2.0 10.5 Tf -[<7570646174656442> 20.01953125 <79>] TJ +<7570646174656444617465> Tj ET @@ -47510,7 +47507,7 @@ S BT 272.17692192000004 408.853 Td /F1.0 10.5 Tf -<737472696e67> Tj +<696e74656765722028696e74363429> Tj ET 0.000 0.000 0.000 scn @@ -47545,7 +47542,7 @@ S BT 51.24 378.43300000000005 Td /F2.0 10.5 Tf -<7570646174656444617465> Tj +[<7573656442> 20.01953125 <794c6f6f7073>] TJ ET @@ -47588,95 +47585,13 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn - -BT -272.17692192000004 371.29300000000006 Td -/F1.0 10.5 Tf -<696e74656765722028696e74363429> Tj -ET - -0.000 0.000 0.000 scn -0.5 w -0.867 0.867 0.867 SCN -48.240 357.120 m -269.177 357.120 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -48.240 319.560 m -269.177 319.560 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -48.240 357.370 m -48.240 319.310 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 357.370 m -269.177 319.310 l -S -[ ] 0 d -1 w -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn - -BT -51.24 340.8730000000001 Td -/F2.0 10.5 Tf -[<7573656442> 20.01953125 <794c6f6f7073>] TJ -ET - - -BT -51.24 326.5930000000001 Td -ET - - -BT -51.24 326.5930000000001 Td -/F3.0 10.5 Tf -<6f7074696f6e616c> Tj -ET - -0.000 0.000 0.000 scn -0.5 w -0.867 0.867 0.867 SCN -269.177 357.120 m -563.760 357.120 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 319.560 m -563.760 319.560 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 357.370 m -269.177 319.310 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -563.760 357.370 m -563.760 319.310 l -S -[ ] 0 d -1 w -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn 0.259 0.545 0.792 scn 0.259 0.545 0.792 SCN 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn BT -272.17692192000004 333.7330000000001 Td +272.17692192000004 371.29300000000006 Td /F1.0 10.5 Tf <3c20> Tj ET @@ -47685,7 +47600,7 @@ ET 0.259 0.545 0.792 SCN BT -280.76592192000004 333.7330000000001 Td +280.76592192000004 371.29300000000006 Td /F1.0 10.5 Tf <4c6f6f70> Tj ET @@ -47694,7 +47609,7 @@ ET 0.200 0.200 0.200 scn BT -305.86092192000007 333.7330000000001 Td +305.86092192000007 371.29300000000006 Td /F1.0 10.5 Tf [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ ET @@ -47704,7 +47619,7 @@ ET 0.200 0.200 0.200 SCN BT -48.24 284.13600000000014 Td +48.24 321.6960000000001 Td /F2.0 18 Tf <332e31372e204e756d626572> Tj ET @@ -47715,7 +47630,7 @@ ET 0.200 0.200 0.200 SCN BT -48.24 255.51600000000008 Td +48.24 293.076 Td /F3.0 10.5 Tf <54797065> Tj ET @@ -47726,7 +47641,7 @@ ET 0.200 0.200 0.200 SCN BT -71.4345 255.51600000000008 Td +71.4345 293.076 Td /F1.0 10.5 Tf <203a206f626a656374> Tj ET @@ -47737,7 +47652,7 @@ ET 0.200 0.200 0.200 SCN BT -48.24 216.27600000000007 Td +48.24 253.836 Td /F2.0 18 Tf [<332e31382e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ ET @@ -47745,59 +47660,67 @@ ET 0.000 0.000 0.000 SCN 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -48.240 176.340 220.937 23.280 re +48.240 213.900 220.937 23.280 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -269.177 176.340 294.583 23.280 re +269.177 213.900 294.583 23.280 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -48.240 138.780 220.937 37.560 re +48.240 176.340 220.937 37.560 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -269.177 138.780 294.583 37.560 re +269.177 176.340 294.583 37.560 re f 0.000 0.000 0.000 scn 0.976 0.976 0.976 scn -48.240 101.220 220.937 37.560 re +48.240 138.780 220.937 37.560 re f 0.000 0.000 0.000 scn 0.976 0.976 0.976 scn -269.177 101.220 294.583 37.560 re +269.177 138.780 294.583 37.560 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -48.240 63.660 220.937 37.560 re +48.240 101.220 220.937 37.560 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn +269.177 101.220 294.583 37.560 re +f +0.000 0.000 0.000 scn +0.976 0.976 0.976 scn +48.240 63.660 220.937 37.560 re +f +0.000 0.000 0.000 scn +0.976 0.976 0.976 scn 269.177 63.660 294.583 37.560 re f 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -48.240 199.620 m -269.177 199.620 l +48.240 237.180 m +269.177 237.180 l S [ ] 0 d 1.5 w 0.867 0.867 0.867 SCN -48.240 176.340 m -269.177 176.340 l +48.240 213.900 m +269.177 213.900 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 199.870 m -48.240 175.590 l +48.240 237.430 m +48.240 213.150 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 199.870 m -269.177 175.590 l +269.177 237.430 m +269.177 213.150 l S [ ] 0 d 1 w @@ -47805,7 +47728,7 @@ S 0.200 0.200 0.200 scn BT -51.24 183.87300000000008 Td +51.24 221.43300000000002 Td /F2.0 10.5 Tf <4e616d65> Tj ET @@ -47813,26 +47736,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -269.177 199.620 m -563.760 199.620 l +269.177 237.180 m +563.760 237.180 l S [ ] 0 d 1.5 w 0.867 0.867 0.867 SCN -269.177 176.340 m -563.760 176.340 l +269.177 213.900 m +563.760 213.900 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 199.870 m -269.177 175.590 l +269.177 237.430 m +269.177 213.150 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -563.760 199.870 m -563.760 175.590 l +563.760 237.430 m +563.760 213.150 l S [ ] 0 d 1 w @@ -47840,11 +47763,101 @@ S 0.200 0.200 0.200 scn BT -272.17692192000004 183.87300000000008 Td +272.17692192000004 221.43300000000002 Td /F2.0 10.5 Tf <536368656d61> Tj ET +0.000 0.000 0.000 scn +0.5 w +0.867 0.867 0.867 SCN +48.240 213.900 m +269.177 213.900 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +48.240 176.340 m +269.177 176.340 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +48.240 214.150 m +48.240 176.090 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +269.177 214.150 m +269.177 176.090 l +S +[ ] 0 d +1 w +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn + +BT +51.24 197.65300000000002 Td +/F2.0 10.5 Tf +[<636f6e6669677572> 20.01953125 <6174696f6e734a736f6e>] TJ +ET + + +BT +51.24 183.37300000000002 Td +ET + + +BT +51.24 183.37300000000002 Td +/F3.0 10.5 Tf +<6f7074696f6e616c> Tj +ET + +0.000 0.000 0.000 scn +0.5 w +0.867 0.867 0.867 SCN +269.177 213.900 m +563.760 213.900 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +269.177 176.340 m +563.760 176.340 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +269.177 214.150 m +269.177 176.090 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +563.760 214.150 m +563.760 176.090 l +S +[ ] 0 d +1 w +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN + +BT +272.17692192000004 190.513 Td +/F1.0 10.5 Tf +<4a736f6e4f626a656374> Tj +ET + +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN @@ -47875,19 +47888,19 @@ S 0.200 0.200 0.200 scn BT -51.24 160.09300000000007 Td +51.24 160.09300000000002 Td /F2.0 10.5 Tf -[<636f6e6669677572> 20.01953125 <6174696f6e734a736f6e>] TJ +[<6372656174656442> 20.01953125 <79>] TJ ET BT -51.24 145.81300000000007 Td +51.24 145.81300000000002 Td ET BT -51.24 145.81300000000007 Td +51.24 145.81300000000002 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -47920,21 +47933,13 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN BT -272.17692192000004 152.95300000000006 Td +272.17692192000004 152.953 Td /F1.0 10.5 Tf -<4a736f6e4f626a656374> Tj +<737472696e67> Tj ET -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN @@ -47965,19 +47970,19 @@ S 0.200 0.200 0.200 scn BT -51.24 122.53300000000007 Td +51.24 122.53300000000002 Td /F2.0 10.5 Tf -[<6372656174656442> 20.01953125 <79>] TJ +<6372656174656444617465> Tj ET BT -51.24 108.25300000000007 Td +51.24 108.25300000000001 Td ET BT -51.24 108.25300000000007 Td +51.24 108.25300000000001 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -48012,9 +48017,9 @@ S 0.200 0.200 0.200 scn BT -272.17692192000004 115.39300000000007 Td +272.17692192000004 115.39300000000001 Td /F1.0 10.5 Tf -<737472696e67> Tj +<696e74656765722028696e74363429> Tj ET 0.000 0.000 0.000 scn @@ -48047,19 +48052,19 @@ S 0.200 0.200 0.200 scn BT -51.24 84.97300000000006 Td +51.24 84.973 Td /F2.0 10.5 Tf -<6372656174656444617465> Tj +<6a736f6e526570726573656e746174696f6e> Tj ET BT -51.24 70.69300000000005 Td +51.24 70.693 Td ET BT -51.24 70.69300000000005 Td +51.24 70.693 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -48092,13 +48097,21 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN BT -272.17692192000004 77.83300000000006 Td +272.17692192000004 77.833 Td /F1.0 10.5 Tf -<696e74656765722028696e74363429> Tj +<4a736f6e4f626a656374> Tj ET +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn 0.000 0.000 0.000 scn q 0.000 0.000 0.000 scn @@ -48124,23 +48137,23 @@ Q endstream endobj -325 0 obj +326 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 324 0 R +/Contents 325 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [326 0 R 327 0 R 328 0 R 329 0 R 332 0 R] +/Annots [327 0 R 328 0 R 329 0 R 330 0 R 333 0 R 334 0 R] >> endobj -326 0 obj +327 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link @@ -48148,46 +48161,54 @@ endobj /Type /Annot >> endobj -327 0 obj +328 0 obj << /Border [0 0 0] /Dest (_loopelementmodel) /Subtype /Link -/Rect [272.17692192000004 631.1469999999999 369.88992192000006 645.4269999999999] +/Rect [272.17692192000004 668.707 369.88992192000006 682.987] /Type /Annot >> endobj -328 0 obj +329 0 obj << /Border [0 0 0] /Dest (_policymodel) /Subtype /Link -/Rect [272.17692192000004 480.90699999999987 333.47592192 495.1869999999999] +/Rect [272.17692192000004 518.467 333.47592192 532.747] /Type /Annot >> endobj -329 0 obj +330 0 obj << /Border [0 0 0] /Dest (_loop) /Subtype /Link -/Rect [280.76592192000004 330.6670000000001 305.86092192000007 344.9470000000001] +/Rect [280.76592192000004 368.22700000000003 305.86092192000007 382.50700000000006] /Type /Annot >> endobj -330 0 obj -[325 0 R /XYZ 0 307.5600000000001 null] -endobj 331 0 obj -[325 0 R /XYZ 0 239.70000000000007 null] +[326 0 R /XYZ 0 345.12000000000006 null] endobj 332 0 obj +[326 0 R /XYZ 0 277.26 null] +endobj +333 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link -/Rect [272.17692192000004 149.88700000000009 325.32792192000005 164.1670000000001] +/Rect [272.17692192000004 187.44700000000003 325.32792192000005 201.72700000000003] /Type /Annot >> endobj -333 0 obj -<< /Length 21550 +334 0 obj +<< /Border [0 0 0] +/Dest (_jsonobject) +/Subtype /Link +/Rect [272.17692192000004 74.767 325.32792192000005 89.047] +/Type /Annot +>> +endobj +335 0 obj +<< /Length 21618 >> stream q @@ -48264,22 +48285,6 @@ f 269.177 432.240 294.583 37.560 re f 0.000 0.000 0.000 scn -1.000 1.000 1.000 scn -48.240 394.680 220.937 37.560 re -f -0.000 0.000 0.000 scn -1.000 1.000 1.000 scn -269.177 394.680 294.583 37.560 re -f -0.000 0.000 0.000 scn -0.976 0.976 0.976 scn -48.240 357.120 220.937 37.560 re -f -0.000 0.000 0.000 scn -0.976 0.976 0.976 scn -269.177 357.120 294.583 37.560 re -f -0.000 0.000 0.000 scn 0.5 w /DeviceRGB CS 0.867 0.867 0.867 SCN @@ -48382,7 +48387,7 @@ S BT 51.24 716.473 Td /F2.0 10.5 Tf -<6a736f6e526570726573656e746174696f6e> Tj +<6c6f6f70> Tj ET @@ -48435,7 +48440,7 @@ S BT 272.17692192000004 709.333 Td /F1.0 10.5 Tf -<4a736f6e4f626a656374> Tj +<4c6f6f70> Tj ET 0.000 0.000 0.000 SCN @@ -48472,17 +48477,17 @@ S BT 51.24 678.913 Td /F2.0 10.5 Tf -<6c6567616379> Tj +<6c6f6f70456c656d656e744d6f64656c> Tj ET BT -51.24 664.633 Td +51.24 664.6329999999999 Td ET BT -51.24 664.633 Td +51.24 664.6329999999999 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -48515,13 +48520,21 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN BT -272.17692192000004 671.773 Td +272.17692192000004 671.7729999999999 Td /F1.0 10.5 Tf -<626f6f6c65616e> Tj +<4c6f6f70456c656d656e744d6f64656c> Tj ET +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN @@ -48554,7 +48567,7 @@ S BT 51.24 641.3530000000001 Td /F2.0 10.5 Tf -<6c6f6f70> Tj +<6e616d65> Tj ET @@ -48597,21 +48610,13 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN BT 272.17692192000004 634.213 Td /F1.0 10.5 Tf -<4c6f6f70> Tj +<737472696e67> Tj ET -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN @@ -48642,19 +48647,19 @@ S 0.200 0.200 0.200 scn BT -51.24 603.7930000000001 Td +51.24 603.7929999999999 Td /F2.0 10.5 Tf -<6c6f6f70456c656d656e744d6f64656c> Tj +<70647047726f7570> Tj ET BT -51.24 589.513 Td +51.24 589.5129999999999 Td ET BT -51.24 589.513 Td +51.24 589.5129999999999 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -48687,21 +48692,13 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN BT -272.17692192000004 596.653 Td +272.17692192000004 596.6529999999999 Td /F1.0 10.5 Tf -<4c6f6f70456c656d656e744d6f64656c> Tj +<737472696e67> Tj ET -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN @@ -48734,7 +48731,7 @@ S BT 51.24 566.233 Td /F2.0 10.5 Tf -<6e616d65> Tj +<70647053756267726f7570> Tj ET @@ -48816,17 +48813,17 @@ S BT 51.24 528.673 Td /F2.0 10.5 Tf -<70647047726f7570> Tj +<706f6c6963794d6f64656c> Tj ET BT -51.24 514.393 Td +51.24 514.3929999999999 Td ET BT -51.24 514.393 Td +51.24 514.3929999999999 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -48859,13 +48856,21 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN BT -272.17692192000004 521.533 Td +272.17692192000004 521.5329999999999 Td /F1.0 10.5 Tf -<737472696e67> Tj +<506f6c6963794d6f64656c> Tj ET +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN @@ -48896,9 +48901,9 @@ S 0.200 0.200 0.200 scn BT -51.24 491.113 Td +51.24 491.11299999999994 Td /F2.0 10.5 Tf -<70647053756267726f7570> Tj +[<7570646174656442> 20.01953125 <79>] TJ ET @@ -48943,7 +48948,7 @@ S 0.200 0.200 0.200 scn BT -272.17692192000004 483.973 Td +272.17692192000004 483.97299999999996 Td /F1.0 10.5 Tf <737472696e67> Tj ET @@ -48978,19 +48983,19 @@ S 0.200 0.200 0.200 scn BT -51.24 453.553 Td +51.24 453.55299999999994 Td /F2.0 10.5 Tf -<706f6c6963794d6f64656c> Tj +<7570646174656444617465> Tj ET BT -51.24 439.273 Td +51.24 439.2729999999999 Td ET BT -51.24 439.273 Td +51.24 439.2729999999999 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -49023,181 +49028,9 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN - -BT -272.17692192000004 446.413 Td -/F1.0 10.5 Tf -<506f6c6963794d6f64656c> Tj -ET - -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn -0.000 0.000 0.000 scn -0.5 w -0.867 0.867 0.867 SCN -48.240 432.240 m -269.177 432.240 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -48.240 394.680 m -269.177 394.680 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -48.240 432.490 m -48.240 394.430 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 432.490 m -269.177 394.430 l -S -[ ] 0 d -1 w -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn BT -51.24 415.993 Td -/F2.0 10.5 Tf -[<7570646174656442> 20.01953125 <79>] TJ -ET - - -BT -51.24 401.71299999999997 Td -ET - - -BT -51.24 401.71299999999997 Td -/F3.0 10.5 Tf -<6f7074696f6e616c> Tj -ET - -0.000 0.000 0.000 scn -0.5 w -0.867 0.867 0.867 SCN -269.177 432.240 m -563.760 432.240 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 394.680 m -563.760 394.680 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 432.490 m -269.177 394.430 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -563.760 432.490 m -563.760 394.430 l -S -[ ] 0 d -1 w -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn - -BT -272.17692192000004 408.853 Td -/F1.0 10.5 Tf -<737472696e67> Tj -ET - -0.000 0.000 0.000 scn -0.5 w -0.867 0.867 0.867 SCN -48.240 394.680 m -269.177 394.680 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -48.240 357.120 m -269.177 357.120 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -48.240 394.930 m -48.240 356.870 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 394.930 m -269.177 356.870 l -S -[ ] 0 d -1 w -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn - -BT -51.24 378.433 Td -/F2.0 10.5 Tf -<7570646174656444617465> Tj -ET - - -BT -51.24 364.153 Td -ET - - -BT -51.24 364.153 Td -/F3.0 10.5 Tf -<6f7074696f6e616c> Tj -ET - -0.000 0.000 0.000 scn -0.5 w -0.867 0.867 0.867 SCN -269.177 394.680 m -563.760 394.680 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 357.120 m -563.760 357.120 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 394.930 m -269.177 356.870 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -563.760 394.930 m -563.760 356.870 l -S -[ ] 0 d -1 w -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn - -BT -272.17692192000004 371.293 Td +272.17692192000004 446.41299999999995 Td /F1.0 10.5 Tf <696e74656765722028696e74363429> Tj ET @@ -49207,7 +49040,7 @@ ET 0.200 0.200 0.200 SCN BT -48.24 321.696 Td +48.24 396.816 Td /F2.0 18 Tf <332e31392e20506f6c6963794d6f64656c> Tj ET @@ -49215,11 +49048,27 @@ ET 0.000 0.000 0.000 SCN 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -48.240 281.760 220.937 23.280 re +48.240 356.880 220.937 23.280 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -269.177 281.760 294.583 23.280 re +269.177 356.880 294.583 23.280 re +f +0.000 0.000 0.000 scn +1.000 1.000 1.000 scn +48.240 319.320 220.937 37.560 re +f +0.000 0.000 0.000 scn +1.000 1.000 1.000 scn +269.177 319.320 294.583 37.560 re +f +0.000 0.000 0.000 scn +0.976 0.976 0.976 scn +48.240 281.760 220.937 37.560 re +f +0.000 0.000 0.000 scn +0.976 0.976 0.976 scn +269.177 281.760 294.583 37.560 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn @@ -49272,26 +49121,26 @@ f 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -48.240 305.040 m -269.177 305.040 l +48.240 380.160 m +269.177 380.160 l S [ ] 0 d 1.5 w 0.867 0.867 0.867 SCN -48.240 281.760 m -269.177 281.760 l +48.240 356.880 m +269.177 356.880 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 305.290 m -48.240 281.010 l +48.240 380.410 m +48.240 356.130 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 305.290 m -269.177 281.010 l +269.177 380.410 m +269.177 356.130 l S [ ] 0 d 1 w @@ -49299,7 +49148,7 @@ S 0.200 0.200 0.200 scn BT -51.24 289.29299999999995 Td +51.24 364.4129999999999 Td /F2.0 10.5 Tf <4e616d65> Tj ET @@ -49307,26 +49156,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -269.177 305.040 m -563.760 305.040 l +269.177 380.160 m +563.760 380.160 l S [ ] 0 d 1.5 w 0.867 0.867 0.867 SCN -269.177 281.760 m -563.760 281.760 l +269.177 356.880 m +563.760 356.880 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 305.290 m -269.177 281.010 l +269.177 380.410 m +269.177 356.130 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -563.760 305.290 m -563.760 281.010 l +563.760 380.410 m +563.760 356.130 l S [ ] 0 d 1 w @@ -49334,11 +49183,175 @@ S 0.200 0.200 0.200 scn BT -272.17692192000004 289.29299999999995 Td +272.17692192000004 364.4129999999999 Td /F2.0 10.5 Tf <536368656d61> Tj ET +0.000 0.000 0.000 scn +0.5 w +0.867 0.867 0.867 SCN +48.240 356.880 m +269.177 356.880 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +48.240 319.320 m +269.177 319.320 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +48.240 357.130 m +48.240 319.070 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +269.177 357.130 m +269.177 319.070 l +S +[ ] 0 d +1 w +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn + +BT +51.24 340.63299999999987 Td +/F2.0 10.5 Tf +[<6372656174656442> 20.01953125 <79>] TJ +ET + + +BT +51.24 326.35299999999984 Td +ET + + +BT +51.24 326.35299999999984 Td +/F3.0 10.5 Tf +<6f7074696f6e616c> Tj +ET + +0.000 0.000 0.000 scn +0.5 w +0.867 0.867 0.867 SCN +269.177 356.880 m +563.760 356.880 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +269.177 319.320 m +563.760 319.320 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +269.177 357.130 m +269.177 319.070 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +563.760 357.130 m +563.760 319.070 l +S +[ ] 0 d +1 w +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn + +BT +272.17692192000004 333.4929999999999 Td +/F1.0 10.5 Tf +<737472696e67> Tj +ET + +0.000 0.000 0.000 scn +0.5 w +0.867 0.867 0.867 SCN +48.240 319.320 m +269.177 319.320 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +48.240 281.760 m +269.177 281.760 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +48.240 319.570 m +48.240 281.510 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +269.177 319.570 m +269.177 281.510 l +S +[ ] 0 d +1 w +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn + +BT +51.24 303.0729999999999 Td +/F2.0 10.5 Tf +<6372656174656444617465> Tj +ET + + +BT +51.24 288.7929999999999 Td +ET + + +BT +51.24 288.7929999999999 Td +/F3.0 10.5 Tf +<6f7074696f6e616c> Tj +ET + +0.000 0.000 0.000 scn +0.5 w +0.867 0.867 0.867 SCN +269.177 319.320 m +563.760 319.320 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +269.177 281.760 m +563.760 281.760 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +269.177 319.570 m +269.177 281.510 l +S +[ ] 0 d +0.5 w +0.867 0.867 0.867 SCN +563.760 319.570 m +563.760 281.510 l +S +[ ] 0 d +1 w +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn + +BT +272.17692192000004 295.93299999999994 Td +/F1.0 10.5 Tf +<696e74656765722028696e74363429> Tj +ET + 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN @@ -49369,19 +49382,19 @@ S 0.200 0.200 0.200 scn BT -51.24 265.513 Td +51.24 265.51299999999986 Td /F2.0 10.5 Tf -[<6372656174656442> 20.01953125 <79>] TJ +[<706f6c69637941> 20.01953125 <63726f6e> 20.01953125 <796d>] TJ ET BT -51.24 251.23299999999998 Td +51.24 251.23299999999986 Td ET BT -51.24 251.23299999999998 Td +51.24 251.23299999999986 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -49416,7 +49429,7 @@ S 0.200 0.200 0.200 scn BT -272.17692192000004 258.373 Td +272.17692192000004 258.3729999999999 Td /F1.0 10.5 Tf <737472696e67> Tj ET @@ -49451,19 +49464,19 @@ S 0.200 0.200 0.200 scn BT -51.24 227.95299999999997 Td +51.24 227.95299999999992 Td /F2.0 10.5 Tf -<6372656174656444617465> Tj +[<706f6c6963794d6f64656c54> 29.78515625 <6f736361>] TJ ET BT -51.24 213.67299999999997 Td +51.24 213.67299999999992 Td ET BT -51.24 213.67299999999997 Td +51.24 213.67299999999992 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -49498,9 +49511,9 @@ S 0.200 0.200 0.200 scn BT -272.17692192000004 220.81299999999996 Td +272.17692192000004 220.8129999999999 Td /F1.0 10.5 Tf -<696e74656765722028696e74363429> Tj +<737472696e67> Tj ET 0.000 0.000 0.000 scn @@ -49533,19 +49546,19 @@ S 0.200 0.200 0.200 scn BT -51.24 190.39299999999997 Td +51.24 190.39299999999992 Td /F2.0 10.5 Tf -[<706f6c69637941> 20.01953125 <63726f6e> 20.01953125 <796d>] TJ +<706f6c6963794d6f64656c54797065> Tj ET BT -51.24 176.11299999999997 Td +51.24 176.11299999999991 Td ET BT -51.24 176.11299999999997 Td +51.24 176.11299999999991 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -49580,7 +49593,7 @@ S 0.200 0.200 0.200 scn BT -272.17692192000004 183.25299999999996 Td +272.17692192000004 183.2529999999999 Td /F1.0 10.5 Tf <737472696e67> Tj ET @@ -49615,19 +49628,19 @@ S 0.200 0.200 0.200 scn BT -51.24 152.83299999999997 Td +51.24 152.8329999999999 Td /F2.0 10.5 Tf -[<706f6c6963794d6f64656c54> 29.78515625 <6f736361>] TJ +<706f6c69637950647047726f7570> Tj ET BT -51.24 138.55299999999997 Td +51.24 138.5529999999999 Td ET BT -51.24 138.55299999999997 Td +51.24 138.5529999999999 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -49660,13 +49673,21 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN BT -272.17692192000004 145.69299999999996 Td +272.17692192000004 145.6929999999999 Td /F1.0 10.5 Tf -<737472696e67> Tj +<4a736f6e4f626a656374> Tj ET +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN @@ -49697,19 +49718,19 @@ S 0.200 0.200 0.200 scn BT -51.24 115.27299999999995 Td +51.24 115.2729999999999 Td /F2.0 10.5 Tf -<706f6c6963794d6f64656c54797065> Tj +[<7570646174656442> 20.01953125 <79>] TJ ET BT -51.24 100.99299999999995 Td +51.24 100.9929999999999 Td ET BT -51.24 100.99299999999995 Td +51.24 100.9929999999999 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -49744,7 +49765,7 @@ S 0.200 0.200 0.200 scn BT -272.17692192000004 108.13299999999995 Td +272.17692192000004 108.1329999999999 Td /F1.0 10.5 Tf <737472696e67> Tj ET @@ -49779,19 +49800,19 @@ S 0.200 0.200 0.200 scn BT -51.24 77.71299999999995 Td +51.24 77.71299999999987 Td /F2.0 10.5 Tf -<706f6c69637950647047726f7570> Tj +<7570646174656444617465> Tj ET BT -51.24 63.43299999999995 Td +51.24 63.432999999999865 Td ET BT -51.24 63.43299999999995 Td +51.24 63.432999999999865 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -49824,21 +49845,13 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN BT -272.17692192000004 70.57299999999995 Td +272.17692192000004 70.57299999999987 Td /F1.0 10.5 Tf -<4a736f6e4f626a656374> Tj +<696e74656765722028696e74363429> Tj ET -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn 0.000 0.000 0.000 scn q 0.000 0.000 0.000 scn @@ -49864,67 +49877,59 @@ Q endstream endobj -334 0 obj +336 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 333 0 R +/Contents 335 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [335 0 R 336 0 R 337 0 R 338 0 R 340 0 R] +/Annots [337 0 R 338 0 R 339 0 R 341 0 R] >> endobj -335 0 obj -<< /Border [0 0 0] -/Dest (_jsonobject) -/Subtype /Link -/Rect [272.17692192000004 706.267 325.32792192000005 720.547] -/Type /Annot ->> -endobj -336 0 obj +337 0 obj << /Border [0 0 0] /Dest (_loop) /Subtype /Link -/Rect [272.17692192000004 631.147 297.27192192000007 645.427] +/Rect [272.17692192000004 706.267 297.27192192000007 720.547] /Type /Annot >> endobj -337 0 obj +338 0 obj << /Border [0 0 0] /Dest (_loopelementmodel) /Subtype /Link -/Rect [272.17692192000004 593.5870000000001 369.88992192000006 607.8670000000001] +/Rect [272.17692192000004 668.707 369.88992192000006 682.987] /Type /Annot >> endobj -338 0 obj +339 0 obj << /Border [0 0 0] /Dest (_policymodel) /Subtype /Link -/Rect [272.17692192000004 443.347 333.47592192 457.627] +/Rect [272.17692192000004 518.467 333.47592192 532.747] /Type /Annot >> endobj -339 0 obj -[334 0 R /XYZ 0 345.12 null] -endobj 340 0 obj +[336 0 R /XYZ 0 420.23999999999995 null] +endobj +341 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link -/Rect [272.17692192000004 67.50699999999995 325.32792192000005 81.78699999999995] +/Rect [272.17692192000004 142.62699999999992 325.32792192000005 156.90699999999993] /Type /Annot >> endobj -341 0 obj -<< /Length 13509 +342 0 obj +<< /Length 11146 >> stream q @@ -49953,22 +49958,6 @@ f 269.177 657.600 294.583 37.560 re f 0.000 0.000 0.000 scn -1.000 1.000 1.000 scn -48.240 620.040 220.937 37.560 re -f -0.000 0.000 0.000 scn -1.000 1.000 1.000 scn -269.177 620.040 294.583 37.560 re -f -0.000 0.000 0.000 scn -0.976 0.976 0.976 scn -48.240 582.480 220.937 37.560 re -f -0.000 0.000 0.000 scn -0.976 0.976 0.976 scn -269.177 582.480 294.583 37.560 re -f -0.000 0.000 0.000 scn 0.5 w /DeviceRGB CS 0.867 0.867 0.867 SCN @@ -50071,7 +50060,7 @@ S BT 51.24 716.473 Td /F2.0 10.5 Tf -[<7570646174656442> 20.01953125 <79>] TJ +[<7573656442> 20.01953125 <79456c656d656e744d6f64656c73>] TJ ET @@ -50114,11 +50103,33 @@ S 1 w 0.000 0.000 0.000 SCN 0.200 0.200 0.200 scn +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn BT 272.17692192000004 709.333 Td /F1.0 10.5 Tf -<737472696e67> Tj +<3c20> Tj +ET + +0.259 0.545 0.792 scn +0.259 0.545 0.792 SCN + +BT +280.76592192000004 709.333 Td +/F1.0 10.5 Tf +<4c6f6f70456c656d656e744d6f64656c> Tj +ET + +0.000 0.000 0.000 SCN +0.200 0.200 0.200 scn + +BT +378.47892192000006 709.333 Td +/F1.0 10.5 Tf +[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ ET 0.000 0.000 0.000 scn @@ -50153,7 +50164,7 @@ S BT 51.24 678.913 Td /F2.0 10.5 Tf -<7570646174656444617465> Tj +<76657273696f6e> Tj ET @@ -50200,192 +50211,6 @@ S BT 272.17692192000004 671.7729999999999 Td /F1.0 10.5 Tf -<696e74656765722028696e74363429> Tj -ET - -0.000 0.000 0.000 scn -0.5 w -0.867 0.867 0.867 SCN -48.240 657.600 m -269.177 657.600 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -48.240 620.040 m -269.177 620.040 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -48.240 657.850 m -48.240 619.790 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 657.850 m -269.177 619.790 l -S -[ ] 0 d -1 w -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn - -BT -51.24 641.3529999999998 Td -/F2.0 10.5 Tf -[<7573656442> 20.01953125 <79456c656d656e744d6f64656c73>] TJ -ET - - -BT -51.24 627.0729999999999 Td -ET - - -BT -51.24 627.0729999999999 Td -/F3.0 10.5 Tf -<6f7074696f6e616c> Tj -ET - -0.000 0.000 0.000 scn -0.5 w -0.867 0.867 0.867 SCN -269.177 657.600 m -563.760 657.600 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 620.040 m -563.760 620.040 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 657.850 m -269.177 619.790 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -563.760 657.850 m -563.760 619.790 l -S -[ ] 0 d -1 w -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn - -BT -272.17692192000004 634.2129999999999 Td -/F1.0 10.5 Tf -<3c20> Tj -ET - -0.259 0.545 0.792 scn -0.259 0.545 0.792 SCN - -BT -280.76592192000004 634.2129999999999 Td -/F1.0 10.5 Tf -<4c6f6f70456c656d656e744d6f64656c> Tj -ET - -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn - -BT -378.47892192000006 634.2129999999999 Td -/F1.0 10.5 Tf -[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ -ET - -0.000 0.000 0.000 scn -0.5 w -0.867 0.867 0.867 SCN -48.240 620.040 m -269.177 620.040 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -48.240 582.480 m -269.177 582.480 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -48.240 620.290 m -48.240 582.230 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 620.290 m -269.177 582.230 l -S -[ ] 0 d -1 w -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn - -BT -51.24 603.7929999999999 Td -/F2.0 10.5 Tf -<76657273696f6e> Tj -ET - - -BT -51.24 589.5129999999999 Td -ET - - -BT -51.24 589.5129999999999 Td -/F3.0 10.5 Tf -<6f7074696f6e616c> Tj -ET - -0.000 0.000 0.000 scn -0.5 w -0.867 0.867 0.867 SCN -269.177 620.040 m -563.760 620.040 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 582.480 m -563.760 582.480 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -269.177 620.290 m -269.177 582.230 l -S -[ ] 0 d -0.5 w -0.867 0.867 0.867 SCN -563.760 620.290 m -563.760 582.230 l -S -[ ] 0 d -1 w -0.000 0.000 0.000 SCN -0.200 0.200 0.200 scn - -BT -272.17692192000004 596.6529999999999 Td -/F1.0 10.5 Tf <737472696e67> Tj ET @@ -50394,7 +50219,7 @@ ET 0.200 0.200 0.200 SCN BT -48.24 547.056 Td +48.24 622.1759999999999 Td /F2.0 18 Tf <332e32302e2053657276696365> Tj ET @@ -50402,75 +50227,75 @@ ET 0.000 0.000 0.000 SCN 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -48.240 507.120 220.937 23.280 re +48.240 582.240 220.937 23.280 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -269.177 507.120 294.583 23.280 re +269.177 582.240 294.583 23.280 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -48.240 469.560 220.937 37.560 re +48.240 544.680 220.937 37.560 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -269.177 469.560 294.583 37.560 re +269.177 544.680 294.583 37.560 re f 0.000 0.000 0.000 scn 0.976 0.976 0.976 scn -48.240 432.000 220.937 37.560 re +48.240 507.120 220.937 37.560 re f 0.000 0.000 0.000 scn 0.976 0.976 0.976 scn -269.177 432.000 294.583 37.560 re +269.177 507.120 294.583 37.560 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -48.240 394.440 220.937 37.560 re +48.240 469.560 220.937 37.560 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -269.177 394.440 294.583 37.560 re +269.177 469.560 294.583 37.560 re f 0.000 0.000 0.000 scn 0.976 0.976 0.976 scn -48.240 356.880 220.937 37.560 re +48.240 432.000 220.937 37.560 re f 0.000 0.000 0.000 scn 0.976 0.976 0.976 scn -269.177 356.880 294.583 37.560 re +269.177 432.000 294.583 37.560 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -48.240 319.320 220.937 37.560 re +48.240 394.440 220.937 37.560 re f 0.000 0.000 0.000 scn 1.000 1.000 1.000 scn -269.177 319.320 294.583 37.560 re +269.177 394.440 294.583 37.560 re f 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -48.240 530.400 m -269.177 530.400 l +48.240 605.520 m +269.177 605.520 l S [ ] 0 d 1.5 w 0.867 0.867 0.867 SCN -48.240 507.120 m -269.177 507.120 l +48.240 582.240 m +269.177 582.240 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 530.650 m -48.240 506.370 l +48.240 605.770 m +48.240 581.490 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 530.650 m -269.177 506.370 l +269.177 605.770 m +269.177 581.490 l S [ ] 0 d 1 w @@ -50478,7 +50303,7 @@ S 0.200 0.200 0.200 scn BT -51.24 514.653 Td +51.24 589.7729999999999 Td /F2.0 10.5 Tf <4e616d65> Tj ET @@ -50486,26 +50311,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -269.177 530.400 m -563.760 530.400 l +269.177 605.520 m +563.760 605.520 l S [ ] 0 d 1.5 w 0.867 0.867 0.867 SCN -269.177 507.120 m -563.760 507.120 l +269.177 582.240 m +563.760 582.240 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 530.650 m -269.177 506.370 l +269.177 605.770 m +269.177 581.490 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -563.760 530.650 m -563.760 506.370 l +563.760 605.770 m +563.760 581.490 l S [ ] 0 d 1 w @@ -50513,7 +50338,7 @@ S 0.200 0.200 0.200 scn BT -272.17692192000004 514.653 Td +272.17692192000004 589.7729999999999 Td /F2.0 10.5 Tf <536368656d61> Tj ET @@ -50521,26 +50346,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -48.240 507.120 m -269.177 507.120 l +48.240 582.240 m +269.177 582.240 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 469.560 m -269.177 469.560 l +48.240 544.680 m +269.177 544.680 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 507.370 m -48.240 469.310 l +48.240 582.490 m +48.240 544.430 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 507.370 m -269.177 469.310 l +269.177 582.490 m +269.177 544.430 l S [ ] 0 d 1 w @@ -50548,19 +50373,19 @@ S 0.200 0.200 0.200 scn BT -51.24 490.8730000000001 Td +51.24 565.9929999999999 Td /F2.0 10.5 Tf <6e616d65> Tj ET BT -51.24 476.5930000000001 Td +51.24 551.713 Td ET BT -51.24 476.5930000000001 Td +51.24 551.713 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -50568,26 +50393,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -269.177 507.120 m -563.760 507.120 l +269.177 582.240 m +563.760 582.240 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 469.560 m -563.760 469.560 l +269.177 544.680 m +563.760 544.680 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 507.370 m -269.177 469.310 l +269.177 582.490 m +269.177 544.430 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -563.760 507.370 m -563.760 469.310 l +563.760 582.490 m +563.760 544.430 l S [ ] 0 d 1 w @@ -50595,7 +50420,7 @@ S 0.200 0.200 0.200 scn BT -272.17692192000004 483.7330000000001 Td +272.17692192000004 558.853 Td /F1.0 10.5 Tf <737472696e67> Tj ET @@ -50603,26 +50428,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -48.240 469.560 m -269.177 469.560 l +48.240 544.680 m +269.177 544.680 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 432.000 m -269.177 432.000 l +48.240 507.120 m +269.177 507.120 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 469.810 m -48.240 431.750 l +48.240 544.930 m +48.240 506.870 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 469.810 m -269.177 431.750 l +269.177 544.930 m +269.177 506.870 l S [ ] 0 d 1 w @@ -50630,19 +50455,19 @@ S 0.200 0.200 0.200 scn BT -51.24 453.31300000000005 Td +51.24 528.433 Td /F2.0 10.5 Tf <7265736f7572636544657461696c73> Tj ET BT -51.24 439.033 Td +51.24 514.1529999999999 Td ET BT -51.24 439.033 Td +51.24 514.1529999999999 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -50650,26 +50475,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -269.177 469.560 m -563.760 469.560 l +269.177 544.680 m +563.760 544.680 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 432.000 m -563.760 432.000 l +269.177 507.120 m +563.760 507.120 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 469.810 m -269.177 431.750 l +269.177 544.930 m +269.177 506.870 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -563.760 469.810 m -563.760 431.750 l +563.760 544.930 m +563.760 506.870 l S [ ] 0 d 1 w @@ -50683,7 +50508,7 @@ S 0.259 0.545 0.792 SCN BT -272.17692192000004 446.17300000000006 Td +272.17692192000004 521.2929999999999 Td /F1.0 10.5 Tf <4a736f6e4f626a656374> Tj ET @@ -50693,26 +50518,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -48.240 432.000 m -269.177 432.000 l +48.240 507.120 m +269.177 507.120 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 394.440 m -269.177 394.440 l +48.240 469.560 m +269.177 469.560 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 432.250 m -48.240 394.190 l +48.240 507.370 m +48.240 469.310 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 432.250 m -269.177 394.190 l +269.177 507.370 m +269.177 469.310 l S [ ] 0 d 1 w @@ -50720,19 +50545,19 @@ S 0.200 0.200 0.200 scn BT -51.24 415.7530000000001 Td +51.24 490.873 Td /F2.0 10.5 Tf <7365727669636544657461696c73> Tj ET BT -51.24 401.47300000000007 Td +51.24 476.59299999999996 Td ET BT -51.24 401.47300000000007 Td +51.24 476.59299999999996 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -50740,26 +50565,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -269.177 432.000 m -563.760 432.000 l +269.177 507.120 m +563.760 507.120 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 394.440 m -563.760 394.440 l +269.177 469.560 m +563.760 469.560 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 432.250 m -269.177 394.190 l +269.177 507.370 m +269.177 469.310 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -563.760 432.250 m -563.760 394.190 l +563.760 507.370 m +563.760 469.310 l S [ ] 0 d 1 w @@ -50773,7 +50598,7 @@ S 0.259 0.545 0.792 SCN BT -272.17692192000004 408.6130000000001 Td +272.17692192000004 483.733 Td /F1.0 10.5 Tf <4a736f6e4f626a656374> Tj ET @@ -50783,26 +50608,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -48.240 394.440 m -269.177 394.440 l +48.240 469.560 m +269.177 469.560 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 356.880 m -269.177 356.880 l +48.240 432.000 m +269.177 432.000 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 394.690 m -48.240 356.630 l +48.240 469.810 m +48.240 431.750 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 394.690 m -269.177 356.630 l +269.177 469.810 m +269.177 431.750 l S [ ] 0 d 1 w @@ -50810,19 +50635,19 @@ S 0.200 0.200 0.200 scn BT -51.24 378.19300000000004 Td +51.24 453.31299999999993 Td /F2.0 10.5 Tf <7365727669636555756964> Tj ET BT -51.24 363.913 Td +51.24 439.0329999999999 Td ET BT -51.24 363.913 Td +51.24 439.0329999999999 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -50830,26 +50655,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -269.177 394.440 m -563.760 394.440 l +269.177 469.560 m +563.760 469.560 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 356.880 m -563.760 356.880 l +269.177 432.000 m +563.760 432.000 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 394.690 m -269.177 356.630 l +269.177 469.810 m +269.177 431.750 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -563.760 394.690 m -563.760 356.630 l +563.760 469.810 m +563.760 431.750 l S [ ] 0 d 1 w @@ -50857,7 +50682,7 @@ S 0.200 0.200 0.200 scn BT -272.17692192000004 371.05300000000005 Td +272.17692192000004 446.17299999999994 Td /F1.0 10.5 Tf <737472696e67> Tj ET @@ -50865,26 +50690,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -48.240 356.880 m -269.177 356.880 l +48.240 432.000 m +269.177 432.000 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 319.320 m -269.177 319.320 l +48.240 394.440 m +269.177 394.440 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -48.240 357.130 m -48.240 319.070 l +48.240 432.250 m +48.240 394.190 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 357.130 m -269.177 319.070 l +269.177 432.250 m +269.177 394.190 l S [ ] 0 d 1 w @@ -50892,19 +50717,19 @@ S 0.200 0.200 0.200 scn BT -51.24 340.6330000000001 Td +51.24 415.753 Td /F2.0 10.5 Tf <76657273696f6e> Tj ET BT -51.24 326.35300000000007 Td +51.24 401.47299999999996 Td ET BT -51.24 326.35300000000007 Td +51.24 401.47299999999996 Td /F3.0 10.5 Tf <6f7074696f6e616c> Tj ET @@ -50912,26 +50737,26 @@ ET 0.000 0.000 0.000 scn 0.5 w 0.867 0.867 0.867 SCN -269.177 356.880 m -563.760 356.880 l +269.177 432.000 m +563.760 432.000 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 319.320 m -563.760 319.320 l +269.177 394.440 m +563.760 394.440 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -269.177 357.130 m -269.177 319.070 l +269.177 432.250 m +269.177 394.190 l S [ ] 0 d 0.5 w 0.867 0.867 0.867 SCN -563.760 357.130 m -563.760 319.070 l +563.760 432.250 m +563.760 394.190 l S [ ] 0 d 1 w @@ -50939,7 +50764,7 @@ S 0.200 0.200 0.200 scn BT -272.17692192000004 333.4930000000001 Td +272.17692192000004 408.613 Td /F1.0 10.5 Tf <737472696e67> Tj ET @@ -50969,50 +50794,50 @@ Q endstream endobj -342 0 obj +343 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 612.0 792.0] -/Contents 341 0 R +/Contents 342 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] /Font << /F2.0 24 0 R /F3.0 26 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 675 0 R +/XObject << /Stamp1 676 0 R >> >> -/Annots [343 0 R 345 0 R 346 0 R] +/Annots [344 0 R 346 0 R 347 0 R] >> endobj -343 0 obj +344 0 obj << /Border [0 0 0] /Dest (_loopelementmodel) /Subtype /Link -/Rect [280.76592192000004 631.1469999999999 378.47892192000006 645.4269999999999] +/Rect [280.76592192000004 706.267 378.47892192000006 720.547] /Type /Annot >> endobj -344 0 obj -[342 0 R /XYZ 0 570.48 null] -endobj 345 0 obj +[343 0 R /XYZ 0 645.5999999999999 null] +endobj +346 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link -/Rect [272.17692192000004 443.107 325.32792192000005 457.38700000000006] +/Rect [272.17692192000004 518.227 325.32792192000005 532.507] /Type /Annot >> endobj -346 0 obj +347 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link -/Rect [272.17692192000004 405.5470000000001 325.32792192000005 419.8270000000001] +/Rect [272.17692192000004 480.667 325.32792192000005 494.947] /Type /Annot >> endobj -347 0 obj +348 0 obj << /Border [0 0 0] /Dest (_overview) /Subtype /Link @@ -51020,7 +50845,7 @@ endobj /Type /Annot >> endobj -348 0 obj +349 0 obj << /Border [0 0 0] /Dest (_overview) /Subtype /Link @@ -51028,7 +50853,7 @@ endobj /Type /Annot >> endobj -349 0 obj +350 0 obj << /Border [0 0 0] /Dest (_version_information) /Subtype /Link @@ -51036,7 +50861,7 @@ endobj /Type /Annot >> endobj -350 0 obj +351 0 obj << /Border [0 0 0] /Dest (_version_information) /Subtype /Link @@ -51044,7 +50869,7 @@ endobj /Type /Annot >> endobj -351 0 obj +352 0 obj << /Border [0 0 0] /Dest (_uri_scheme) /Subtype /Link @@ -51052,7 +50877,7 @@ endobj /Type /Annot >> endobj -352 0 obj +353 0 obj << /Border [0 0 0] /Dest (_uri_scheme) /Subtype /Link @@ -51060,7 +50885,7 @@ endobj /Type /Annot >> endobj -353 0 obj +354 0 obj << /Border [0 0 0] /Dest (_paths) /Subtype /Link @@ -51068,7 +50893,7 @@ endobj /Type /Annot >> endobj -354 0 obj +355 0 obj << /Border [0 0 0] /Dest (_paths) /Subtype /Link @@ -51076,23 +50901,23 @@ endobj /Type /Annot >> endobj -355 0 obj +356 0 obj << /Border [0 0 0] -/Dest (_route143) +/Dest (_route35) /Subtype /Link /Rect [60.24000000000001 621.7799999999997 181.64100000000002 636.0599999999998] /Type /Annot >> endobj -356 0 obj +357 0 obj << /Border [0 0 0] -/Dest (_route143) +/Dest (_route35) /Subtype /Link /Rect [557.8905 621.7799999999997 563.76 636.0599999999998] /Type /Annot >> endobj -357 0 obj +358 0 obj << /Border [0 0 0] /Dest (_responses) /Subtype /Link @@ -51100,7 +50925,7 @@ endobj /Type /Annot >> endobj -358 0 obj +359 0 obj << /Border [0 0 0] /Dest (_responses) /Subtype /Link @@ -51108,7 +50933,7 @@ endobj /Type /Annot >> endobj -359 0 obj +360 0 obj << /Border [0 0 0] /Dest (_produces) /Subtype /Link @@ -51116,7 +50941,7 @@ endobj /Type /Annot >> endobj -360 0 obj +361 0 obj << /Border [0 0 0] /Dest (_produces) /Subtype /Link @@ -51124,23 +50949,23 @@ endobj /Type /Annot >> endobj -361 0 obj +362 0 obj << /Border [0 0 0] -/Dest (_route144) +/Dest (_route36) /Subtype /Link /Rect [60.24000000000001 566.3399999999997 183.8775 580.6199999999998] /Type /Annot >> endobj -362 0 obj +363 0 obj << /Border [0 0 0] -/Dest (_route144) +/Dest (_route36) /Subtype /Link /Rect [557.8905 566.3399999999997 563.76 580.6199999999998] /Type /Annot >> endobj -363 0 obj +364 0 obj << /Border [0 0 0] /Dest (_responses_2) /Subtype /Link @@ -51148,7 +50973,7 @@ endobj /Type /Annot >> endobj -364 0 obj +365 0 obj << /Border [0 0 0] /Dest (_responses_2) /Subtype /Link @@ -51156,7 +50981,7 @@ endobj /Type /Annot >> endobj -365 0 obj +366 0 obj << /Border [0 0 0] /Dest (_produces_2) /Subtype /Link @@ -51164,7 +50989,7 @@ endobj /Type /Annot >> endobj -366 0 obj +367 0 obj << /Border [0 0 0] /Dest (_produces_2) /Subtype /Link @@ -51172,23 +50997,23 @@ endobj /Type /Annot >> endobj -367 0 obj +368 0 obj << /Border [0 0 0] -/Dest (_route142) +/Dest (_route34) /Subtype /Link /Rect [60.24000000000001 510.89999999999975 212.98350000000002 525.1799999999997] /Type /Annot >> endobj -368 0 obj +369 0 obj << /Border [0 0 0] -/Dest (_route142) +/Dest (_route34) /Subtype /Link /Rect [557.8905 510.89999999999975 563.76 525.1799999999997] /Type /Annot >> endobj -369 0 obj +370 0 obj << /Border [0 0 0] /Dest (_responses_3) /Subtype /Link @@ -51196,7 +51021,7 @@ endobj /Type /Annot >> endobj -370 0 obj +371 0 obj << /Border [0 0 0] /Dest (_responses_3) /Subtype /Link @@ -51204,7 +51029,7 @@ endobj /Type /Annot >> endobj -371 0 obj +372 0 obj << /Border [0 0 0] /Dest (_produces_3) /Subtype /Link @@ -51212,7 +51037,7 @@ endobj /Type /Annot >> endobj -372 0 obj +373 0 obj << /Border [0 0 0] /Dest (_produces_3) /Subtype /Link @@ -51220,23 +51045,23 @@ endobj /Type /Annot >> endobj -373 0 obj +374 0 obj << /Border [0 0 0] -/Dest (_route127) +/Dest (_route19) /Subtype /Link /Rect [60.24000000000001 455.4599999999997 172.716 469.73999999999967] /Type /Annot >> endobj -374 0 obj +375 0 obj << /Border [0 0 0] -/Dest (_route127) +/Dest (_route19) /Subtype /Link /Rect [557.8905 455.4599999999997 563.76 469.73999999999967] /Type /Annot >> endobj -375 0 obj +376 0 obj << /Border [0 0 0] /Dest (_responses_4) /Subtype /Link @@ -51244,7 +51069,7 @@ endobj /Type /Annot >> endobj -376 0 obj +377 0 obj << /Border [0 0 0] /Dest (_responses_4) /Subtype /Link @@ -51252,7 +51077,7 @@ endobj /Type /Annot >> endobj -377 0 obj +378 0 obj << /Border [0 0 0] /Dest (_produces_4) /Subtype /Link @@ -51260,7 +51085,7 @@ endobj /Type /Annot >> endobj -378 0 obj +379 0 obj << /Border [0 0 0] /Dest (_produces_4) /Subtype /Link @@ -51268,23 +51093,23 @@ endobj /Type /Annot >> endobj -379 0 obj +380 0 obj << /Border [0 0 0] -/Dest (_route130) +/Dest (_route22) /Subtype /Link /Rect [60.24000000000001 400.01999999999964 172.548 414.2999999999996] /Type /Annot >> endobj -380 0 obj +381 0 obj << /Border [0 0 0] -/Dest (_route130) +/Dest (_route22) /Subtype /Link /Rect [557.8905 400.01999999999964 563.76 414.2999999999996] /Type /Annot >> endobj -381 0 obj +382 0 obj << /Border [0 0 0] /Dest (_parameters) /Subtype /Link @@ -51292,7 +51117,7 @@ endobj /Type /Annot >> endobj -382 0 obj +383 0 obj << /Border [0 0 0] /Dest (_parameters) /Subtype /Link @@ -51300,7 +51125,7 @@ endobj /Type /Annot >> endobj -383 0 obj +384 0 obj << /Border [0 0 0] /Dest (_responses_5) /Subtype /Link @@ -51308,7 +51133,7 @@ endobj /Type /Annot >> endobj -384 0 obj +385 0 obj << /Border [0 0 0] /Dest (_responses_5) /Subtype /Link @@ -51316,7 +51141,7 @@ endobj /Type /Annot >> endobj -385 0 obj +386 0 obj << /Border [0 0 0] /Dest (_consumes) /Subtype /Link @@ -51324,7 +51149,7 @@ endobj /Type /Annot >> endobj -386 0 obj +387 0 obj << /Border [0 0 0] /Dest (_consumes) /Subtype /Link @@ -51332,7 +51157,7 @@ endobj /Type /Annot >> endobj -387 0 obj +388 0 obj << /Border [0 0 0] /Dest (_produces_5) /Subtype /Link @@ -51340,7 +51165,7 @@ endobj /Type /Annot >> endobj -388 0 obj +389 0 obj << /Border [0 0 0] /Dest (_produces_5) /Subtype /Link @@ -51348,23 +51173,23 @@ endobj /Type /Annot >> endobj -389 0 obj +390 0 obj << /Border [0 0 0] -/Dest (_route128) +/Dest (_route20) /Subtype /Link /Rect [60.24000000000001 307.61999999999955 263.25750000000005 321.8999999999995] /Type /Annot >> endobj -390 0 obj +391 0 obj << /Border [0 0 0] -/Dest (_route128) +/Dest (_route20) /Subtype /Link /Rect [557.8905 307.61999999999955 563.76 321.8999999999995] /Type /Annot >> endobj -391 0 obj +392 0 obj << /Border [0 0 0] /Dest (_responses_6) /Subtype /Link @@ -51372,7 +51197,7 @@ endobj /Type /Annot >> endobj -392 0 obj +393 0 obj << /Border [0 0 0] /Dest (_responses_6) /Subtype /Link @@ -51380,7 +51205,7 @@ endobj /Type /Annot >> endobj -393 0 obj +394 0 obj << /Border [0 0 0] /Dest (_produces_6) /Subtype /Link @@ -51388,7 +51213,7 @@ endobj /Type /Annot >> endobj -394 0 obj +395 0 obj << /Border [0 0 0] /Dest (_produces_6) /Subtype /Link @@ -51396,23 +51221,23 @@ endobj /Type /Annot >> endobj -395 0 obj +396 0 obj << /Border [0 0 0] -/Dest (_route129) +/Dest (_route21) /Subtype /Link /Rect [60.24000000000001 252.17999999999947 265.76700000000005 266.45999999999947] /Type /Annot >> endobj -396 0 obj +397 0 obj << /Border [0 0 0] -/Dest (_route129) +/Dest (_route21) /Subtype /Link /Rect [557.8905 252.17999999999947 563.76 266.45999999999947] /Type /Annot >> endobj -397 0 obj +398 0 obj << /Border [0 0 0] /Dest (_parameters_2) /Subtype /Link @@ -51420,7 +51245,7 @@ endobj /Type /Annot >> endobj -398 0 obj +399 0 obj << /Border [0 0 0] /Dest (_parameters_2) /Subtype /Link @@ -51428,7 +51253,7 @@ endobj /Type /Annot >> endobj -399 0 obj +400 0 obj << /Border [0 0 0] /Dest (_responses_7) /Subtype /Link @@ -51436,7 +51261,7 @@ endobj /Type /Annot >> endobj -400 0 obj +401 0 obj << /Border [0 0 0] /Dest (_responses_7) /Subtype /Link @@ -51444,7 +51269,7 @@ endobj /Type /Annot >> endobj -401 0 obj +402 0 obj << /Border [0 0 0] /Dest (_produces_7) /Subtype /Link @@ -51452,7 +51277,7 @@ endobj /Type /Annot >> endobj -402 0 obj +403 0 obj << /Border [0 0 0] /Dest (_produces_7) /Subtype /Link @@ -51460,23 +51285,23 @@ endobj /Type /Annot >> endobj -403 0 obj +404 0 obj << /Border [0 0 0] -/Dest (_route131) +/Dest (_route23) /Subtype /Link /Rect [60.24000000000001 178.2599999999995 212.763 192.5399999999995] /Type /Annot >> endobj -404 0 obj +405 0 obj << /Border [0 0 0] -/Dest (_route131) +/Dest (_route23) /Subtype /Link /Rect [557.8905 178.2599999999995 563.76 192.5399999999995] /Type /Annot >> endobj -405 0 obj +406 0 obj << /Border [0 0 0] /Dest (_parameters_3) /Subtype /Link @@ -51484,7 +51309,7 @@ endobj /Type /Annot >> endobj -406 0 obj +407 0 obj << /Border [0 0 0] /Dest (_parameters_3) /Subtype /Link @@ -51492,7 +51317,7 @@ endobj /Type /Annot >> endobj -407 0 obj +408 0 obj << /Border [0 0 0] /Dest (_responses_8) /Subtype /Link @@ -51500,7 +51325,7 @@ endobj /Type /Annot >> endobj -408 0 obj +409 0 obj << /Border [0 0 0] /Dest (_responses_8) /Subtype /Link @@ -51508,7 +51333,7 @@ endobj /Type /Annot >> endobj -409 0 obj +410 0 obj << /Border [0 0 0] /Dest (_consumes_2) /Subtype /Link @@ -51516,7 +51341,7 @@ endobj /Type /Annot >> endobj -410 0 obj +411 0 obj << /Border [0 0 0] /Dest (_consumes_2) /Subtype /Link @@ -51524,7 +51349,7 @@ endobj /Type /Annot >> endobj -411 0 obj +412 0 obj << /Border [0 0 0] /Dest (_produces_8) /Subtype /Link @@ -51532,7 +51357,7 @@ endobj /Type /Annot >> endobj -412 0 obj +413 0 obj << /Border [0 0 0] /Dest (_produces_8) /Subtype /Link @@ -51540,23 +51365,23 @@ endobj /Type /Annot >> endobj -413 0 obj +414 0 obj << /Border [0 0 0] -/Dest (_route132) +/Dest (_route24) /Subtype /Link /Rect [60.24000000000001 85.85999999999956 232.70250000000001 100.13999999999956] /Type /Annot >> endobj -414 0 obj +415 0 obj << /Border [0 0 0] -/Dest (_route132) +/Dest (_route24) /Subtype /Link /Rect [557.8905 85.85999999999956 563.76 100.13999999999956] /Type /Annot >> endobj -415 0 obj +416 0 obj << /Border [0 0 0] /Dest (_parameters_4) /Subtype /Link @@ -51564,7 +51389,7 @@ endobj /Type /Annot >> endobj -416 0 obj +417 0 obj << /Border [0 0 0] /Dest (_parameters_4) /Subtype /Link @@ -51572,7 +51397,7 @@ endobj /Type /Annot >> endobj -417 0 obj +418 0 obj << /Border [0 0 0] /Dest (_responses_9) /Subtype /Link @@ -51580,7 +51405,7 @@ endobj /Type /Annot >> endobj -418 0 obj +419 0 obj << /Border [0 0 0] /Dest (_responses_9) /Subtype /Link @@ -51588,7 +51413,7 @@ endobj /Type /Annot >> endobj -419 0 obj +420 0 obj << /Border [0 0 0] /Dest (_produces_9) /Subtype /Link @@ -51596,7 +51421,7 @@ endobj /Type /Annot >> endobj -420 0 obj +421 0 obj << /Border [0 0 0] /Dest (_produces_9) /Subtype /Link @@ -51604,23 +51429,23 @@ endobj /Type /Annot >> endobj -421 0 obj +422 0 obj << /Border [0 0 0] -/Dest (_route133) +/Dest (_route25) /Subtype /Link /Rect [60.24000000000001 723.2399999999999 354.36600000000004 737.52] /Type /Annot >> endobj -422 0 obj +423 0 obj << /Border [0 0 0] -/Dest (_route133) +/Dest (_route25) /Subtype /Link /Rect [557.8905 723.2399999999999 563.76 737.52] /Type /Annot >> endobj -423 0 obj +424 0 obj << /Border [0 0 0] /Dest (_parameters_5) /Subtype /Link @@ -51628,7 +51453,7 @@ endobj /Type /Annot >> endobj -424 0 obj +425 0 obj << /Border [0 0 0] /Dest (_parameters_5) /Subtype /Link @@ -51636,7 +51461,7 @@ endobj /Type /Annot >> endobj -425 0 obj +426 0 obj << /Border [0 0 0] /Dest (_responses_10) /Subtype /Link @@ -51644,7 +51469,7 @@ endobj /Type /Annot >> endobj -426 0 obj +427 0 obj << /Border [0 0 0] /Dest (_responses_10) /Subtype /Link @@ -51652,7 +51477,7 @@ endobj /Type /Annot >> endobj -427 0 obj +428 0 obj << /Border [0 0 0] /Dest (_produces_10) /Subtype /Link @@ -51660,7 +51485,7 @@ endobj /Type /Annot >> endobj -428 0 obj +429 0 obj << /Border [0 0 0] /Dest (_produces_10) /Subtype /Link @@ -51668,23 +51493,23 @@ endobj /Type /Annot >> endobj -429 0 obj +430 0 obj << /Border [0 0 0] -/Dest (_route124) +/Dest (_route16) /Subtype /Link /Rect [60.24000000000001 649.3199999999998 531.1851796875001 663.5999999999999] /Type /Annot >> endobj -430 0 obj +431 0 obj << /Border [0 0 0] -/Dest (_route124) +/Dest (_route16) /Subtype /Link /Rect [557.8905 649.3199999999998 563.76 663.5999999999999] /Type /Annot >> endobj -431 0 obj +432 0 obj << /Border [0 0 0] /Dest (_parameters_6) /Subtype /Link @@ -51692,7 +51517,7 @@ endobj /Type /Annot >> endobj -432 0 obj +433 0 obj << /Border [0 0 0] /Dest (_parameters_6) /Subtype /Link @@ -51700,7 +51525,7 @@ endobj /Type /Annot >> endobj -433 0 obj +434 0 obj << /Border [0 0 0] /Dest (_responses_11) /Subtype /Link @@ -51708,7 +51533,7 @@ endobj /Type /Annot >> endobj -434 0 obj +435 0 obj << /Border [0 0 0] /Dest (_responses_11) /Subtype /Link @@ -51716,7 +51541,7 @@ endobj /Type /Annot >> endobj -435 0 obj +436 0 obj << /Border [0 0 0] /Dest (_produces_11) /Subtype /Link @@ -51724,7 +51549,7 @@ endobj /Type /Annot >> endobj -436 0 obj +437 0 obj << /Border [0 0 0] /Dest (_produces_11) /Subtype /Link @@ -51732,23 +51557,23 @@ endobj /Type /Annot >> endobj -437 0 obj +438 0 obj << /Border [0 0 0] -/Dest (_route126) +/Dest (_route18) /Subtype /Link /Rect [60.24000000000001 575.3999999999997 418.877794921875 589.6799999999998] /Type /Annot >> endobj -438 0 obj +439 0 obj << /Border [0 0 0] -/Dest (_route126) +/Dest (_route18) /Subtype /Link /Rect [557.8905 575.3999999999997 563.76 589.6799999999998] /Type /Annot >> endobj -439 0 obj +440 0 obj << /Border [0 0 0] /Dest (_parameters_7) /Subtype /Link @@ -51756,7 +51581,7 @@ endobj /Type /Annot >> endobj -440 0 obj +441 0 obj << /Border [0 0 0] /Dest (_parameters_7) /Subtype /Link @@ -51764,7 +51589,7 @@ endobj /Type /Annot >> endobj -441 0 obj +442 0 obj << /Border [0 0 0] /Dest (_responses_12) /Subtype /Link @@ -51772,7 +51597,7 @@ endobj /Type /Annot >> endobj -442 0 obj +443 0 obj << /Border [0 0 0] /Dest (_responses_12) /Subtype /Link @@ -51780,7 +51605,7 @@ endobj /Type /Annot >> endobj -443 0 obj +444 0 obj << /Border [0 0 0] /Dest (_consumes_3) /Subtype /Link @@ -51788,7 +51613,7 @@ endobj /Type /Annot >> endobj -444 0 obj +445 0 obj << /Border [0 0 0] /Dest (_consumes_3) /Subtype /Link @@ -51796,7 +51621,7 @@ endobj /Type /Annot >> endobj -445 0 obj +446 0 obj << /Border [0 0 0] /Dest (_produces_12) /Subtype /Link @@ -51804,7 +51629,7 @@ endobj /Type /Annot >> endobj -446 0 obj +447 0 obj << /Border [0 0 0] /Dest (_produces_12) /Subtype /Link @@ -51812,23 +51637,23 @@ endobj /Type /Annot >> endobj -447 0 obj +448 0 obj << /Border [0 0 0] -/Dest (_route122) +/Dest (_route14) /Subtype /Link /Rect [60.24000000000001 482.9999999999998 245.15550000000002 497.27999999999975] /Type /Annot >> endobj -448 0 obj +449 0 obj << /Border [0 0 0] -/Dest (_route122) +/Dest (_route14) /Subtype /Link /Rect [557.8905 482.9999999999998 563.76 497.27999999999975] /Type /Annot >> endobj -449 0 obj +450 0 obj << /Border [0 0 0] /Dest (_parameters_8) /Subtype /Link @@ -51836,7 +51661,7 @@ endobj /Type /Annot >> endobj -450 0 obj +451 0 obj << /Border [0 0 0] /Dest (_parameters_8) /Subtype /Link @@ -51844,7 +51669,7 @@ endobj /Type /Annot >> endobj -451 0 obj +452 0 obj << /Border [0 0 0] /Dest (_responses_13) /Subtype /Link @@ -51852,7 +51677,7 @@ endobj /Type /Annot >> endobj -452 0 obj +453 0 obj << /Border [0 0 0] /Dest (_responses_13) /Subtype /Link @@ -51860,23 +51685,23 @@ endobj /Type /Annot >> endobj -453 0 obj +454 0 obj << /Border [0 0 0] -/Dest (_route115) +/Dest (_route7) /Subtype /Link /Rect [60.24000000000001 427.5599999999997 248.431294921875 441.8399999999997] /Type /Annot >> endobj -454 0 obj +455 0 obj << /Border [0 0 0] -/Dest (_route115) +/Dest (_route7) /Subtype /Link /Rect [557.8905 427.5599999999997 563.76 441.8399999999997] /Type /Annot >> endobj -455 0 obj +456 0 obj << /Border [0 0 0] /Dest (_parameters_9) /Subtype /Link @@ -51884,7 +51709,7 @@ endobj /Type /Annot >> endobj -456 0 obj +457 0 obj << /Border [0 0 0] /Dest (_parameters_9) /Subtype /Link @@ -51892,7 +51717,7 @@ endobj /Type /Annot >> endobj -457 0 obj +458 0 obj << /Border [0 0 0] /Dest (_responses_14) /Subtype /Link @@ -51900,7 +51725,7 @@ endobj /Type /Annot >> endobj -458 0 obj +459 0 obj << /Border [0 0 0] /Dest (_responses_14) /Subtype /Link @@ -51908,7 +51733,7 @@ endobj /Type /Annot >> endobj -459 0 obj +460 0 obj << /Border [0 0 0] /Dest (_produces_13) /Subtype /Link @@ -51916,7 +51741,7 @@ endobj /Type /Annot >> endobj -460 0 obj +461 0 obj << /Border [0 0 0] /Dest (_produces_13) /Subtype /Link @@ -51924,23 +51749,23 @@ endobj /Type /Annot >> endobj -461 0 obj +462 0 obj << /Border [0 0 0] -/Dest (_route110) +/Dest (_route2) /Subtype /Link /Rect [60.24000000000001 353.63999999999965 214.8735 367.9199999999996] /Type /Annot >> endobj -462 0 obj +463 0 obj << /Border [0 0 0] -/Dest (_route110) +/Dest (_route2) /Subtype /Link /Rect [557.8905 353.63999999999965 563.76 367.9199999999996] /Type /Annot >> endobj -463 0 obj +464 0 obj << /Border [0 0 0] /Dest (_responses_15) /Subtype /Link @@ -51948,7 +51773,7 @@ endobj /Type /Annot >> endobj -464 0 obj +465 0 obj << /Border [0 0 0] /Dest (_responses_15) /Subtype /Link @@ -51956,7 +51781,7 @@ endobj /Type /Annot >> endobj -465 0 obj +466 0 obj << /Border [0 0 0] /Dest (_produces_14) /Subtype /Link @@ -51964,7 +51789,7 @@ endobj /Type /Annot >> endobj -466 0 obj +467 0 obj << /Border [0 0 0] /Dest (_produces_14) /Subtype /Link @@ -51972,23 +51797,23 @@ endobj /Type /Annot >> endobj -467 0 obj +468 0 obj << /Border [0 0 0] -/Dest (_route123) +/Dest (_route15) /Subtype /Link /Rect [60.24000000000001 298.1999999999996 259.467 312.47999999999956] /Type /Annot >> endobj -468 0 obj +469 0 obj << /Border [0 0 0] -/Dest (_route123) +/Dest (_route15) /Subtype /Link /Rect [557.8905 298.1999999999996 563.76 312.47999999999956] /Type /Annot >> endobj -469 0 obj +470 0 obj << /Border [0 0 0] /Dest (_parameters_10) /Subtype /Link @@ -51996,7 +51821,7 @@ endobj /Type /Annot >> endobj -470 0 obj +471 0 obj << /Border [0 0 0] /Dest (_parameters_10) /Subtype /Link @@ -52004,7 +51829,7 @@ endobj /Type /Annot >> endobj -471 0 obj +472 0 obj << /Border [0 0 0] /Dest (_responses_16) /Subtype /Link @@ -52012,7 +51837,7 @@ endobj /Type /Annot >> endobj -472 0 obj +473 0 obj << /Border [0 0 0] /Dest (_responses_16) /Subtype /Link @@ -52020,7 +51845,7 @@ endobj /Type /Annot >> endobj -473 0 obj +474 0 obj << /Border [0 0 0] /Dest (_produces_15) /Subtype /Link @@ -52028,7 +51853,7 @@ endobj /Type /Annot >> endobj -474 0 obj +475 0 obj << /Border [0 0 0] /Dest (_produces_15) /Subtype /Link @@ -52036,23 +51861,23 @@ endobj /Type /Annot >> endobj -475 0 obj +476 0 obj << /Border [0 0 0] -/Dest (_route116) +/Dest (_route8) /Subtype /Link /Rect [60.24000000000001 224.27999999999952 544.9515000000001 238.55999999999952] /Type /Annot >> endobj -476 0 obj +477 0 obj << /Border [0 0 0] -/Dest (_route116) +/Dest (_route8) /Subtype /Link /Rect [557.8905 224.27999999999952 563.76 238.55999999999952] /Type /Annot >> endobj -477 0 obj +478 0 obj << /Border [0 0 0] /Dest (_parameters_11) /Subtype /Link @@ -52060,7 +51885,7 @@ endobj /Type /Annot >> endobj -478 0 obj +479 0 obj << /Border [0 0 0] /Dest (_parameters_11) /Subtype /Link @@ -52068,7 +51893,7 @@ endobj /Type /Annot >> endobj -479 0 obj +480 0 obj << /Border [0 0 0] /Dest (_responses_17) /Subtype /Link @@ -52076,7 +51901,7 @@ endobj /Type /Annot >> endobj -480 0 obj +481 0 obj << /Border [0 0 0] /Dest (_responses_17) /Subtype /Link @@ -52084,7 +51909,7 @@ endobj /Type /Annot >> endobj -481 0 obj +482 0 obj << /Border [0 0 0] /Dest (_produces_16) /Subtype /Link @@ -52092,7 +51917,7 @@ endobj /Type /Annot >> endobj -482 0 obj +483 0 obj << /Border [0 0 0] /Dest (_produces_16) /Subtype /Link @@ -52100,23 +51925,23 @@ endobj /Type /Annot >> endobj -483 0 obj +484 0 obj << /Border [0 0 0] -/Dest (_route117) +/Dest (_route9) /Subtype /Link /Rect [60.24000000000001 150.35999999999956 530.5030898437501 164.63999999999956] /Type /Annot >> endobj -484 0 obj +485 0 obj << /Border [0 0 0] -/Dest (_route117) +/Dest (_route9) /Subtype /Link /Rect [557.8905 150.35999999999956 563.76 164.63999999999956] /Type /Annot >> endobj -485 0 obj +486 0 obj << /Border [0 0 0] /Dest (_parameters_12) /Subtype /Link @@ -52124,7 +51949,7 @@ endobj /Type /Annot >> endobj -486 0 obj +487 0 obj << /Border [0 0 0] /Dest (_parameters_12) /Subtype /Link @@ -52132,7 +51957,7 @@ endobj /Type /Annot >> endobj -487 0 obj +488 0 obj << /Border [0 0 0] /Dest (_responses_18) /Subtype /Link @@ -52140,7 +51965,7 @@ endobj /Type /Annot >> endobj -488 0 obj +489 0 obj << /Border [0 0 0] /Dest (_responses_18) /Subtype /Link @@ -52148,7 +51973,7 @@ endobj /Type /Annot >> endobj -489 0 obj +490 0 obj << /Border [0 0 0] /Dest (_produces_17) /Subtype /Link @@ -52156,7 +51981,7 @@ endobj /Type /Annot >> endobj -490 0 obj +491 0 obj << /Border [0 0 0] /Dest (_produces_17) /Subtype /Link @@ -52164,39 +51989,39 @@ endobj /Type /Annot >> endobj -491 0 obj +492 0 obj << /Border [0 0 0] -/Dest (_route125) +/Dest (_route17) /Subtype /Link /Rect [60.24000000000001 76.4399999999996 106.10400000000001 90.7199999999996] /Type /Annot >> endobj -492 0 obj +493 0 obj << /Border [0 0 0] -/Dest (_route125) +/Dest (_route17) /Subtype /Link /Rect [60.24000000000001 57.959999999999596 553.6761796875 72.2399999999996] /Type /Annot >> endobj -493 0 obj +494 0 obj << /Border [0 0 0] -/Dest (_route125) +/Dest (_route17) /Subtype /Link /Rect [60.24 741.7199999999999 80.26350000000001 756.0] /Type /Annot >> endobj -494 0 obj +495 0 obj << /Border [0 0 0] -/Dest (_route125) +/Dest (_route17) /Subtype /Link /Rect [552.021 76.4399999999996 563.76 90.7199999999996] /Type /Annot >> endobj -495 0 obj +496 0 obj << /Border [0 0 0] /Dest (_parameters_13) /Subtype /Link @@ -52204,7 +52029,7 @@ endobj /Type /Annot >> endobj -496 0 obj +497 0 obj << /Border [0 0 0] /Dest (_parameters_13) /Subtype /Link @@ -52212,7 +52037,7 @@ endobj /Type /Annot >> endobj -497 0 obj +498 0 obj << /Border [0 0 0] /Dest (_responses_19) /Subtype /Link @@ -52220,7 +52045,7 @@ endobj /Type /Annot >> endobj -498 0 obj +499 0 obj << /Border [0 0 0] /Dest (_responses_19) /Subtype /Link @@ -52228,7 +52053,7 @@ endobj /Type /Annot >> endobj -499 0 obj +500 0 obj << /Border [0 0 0] /Dest (_produces_18) /Subtype /Link @@ -52236,7 +52061,7 @@ endobj /Type /Annot >> endobj -500 0 obj +501 0 obj << /Border [0 0 0] /Dest (_produces_18) /Subtype /Link @@ -52244,23 +52069,23 @@ endobj /Type /Annot >> endobj -501 0 obj +502 0 obj << /Border [0 0 0] -/Dest (_route120) +/Dest (_route12) /Subtype /Link /Rect [60.24000000000001 667.7999999999998 248.45250000000001 682.0799999999999] /Type /Annot >> endobj -502 0 obj +503 0 obj << /Border [0 0 0] -/Dest (_route120) +/Dest (_route12) /Subtype /Link /Rect [552.021 667.7999999999998 563.76 682.0799999999999] /Type /Annot >> endobj -503 0 obj +504 0 obj << /Border [0 0 0] /Dest (_parameters_14) /Subtype /Link @@ -52268,7 +52093,7 @@ endobj /Type /Annot >> endobj -504 0 obj +505 0 obj << /Border [0 0 0] /Dest (_parameters_14) /Subtype /Link @@ -52276,7 +52101,7 @@ endobj /Type /Annot >> endobj -505 0 obj +506 0 obj << /Border [0 0 0] /Dest (_responses_20) /Subtype /Link @@ -52284,7 +52109,7 @@ endobj /Type /Annot >> endobj -506 0 obj +507 0 obj << /Border [0 0 0] /Dest (_responses_20) /Subtype /Link @@ -52292,7 +52117,7 @@ endobj /Type /Annot >> endobj -507 0 obj +508 0 obj << /Border [0 0 0] /Dest (_produces_19) /Subtype /Link @@ -52300,7 +52125,7 @@ endobj /Type /Annot >> endobj -508 0 obj +509 0 obj << /Border [0 0 0] /Dest (_produces_19) /Subtype /Link @@ -52308,23 +52133,23 @@ endobj /Type /Annot >> endobj -509 0 obj +510 0 obj << /Border [0 0 0] -/Dest (_route119) +/Dest (_route11) /Subtype /Link /Rect [60.24000000000001 593.8799999999998 235.842 608.1599999999999] /Type /Annot >> endobj -510 0 obj +511 0 obj << /Border [0 0 0] -/Dest (_route119) +/Dest (_route11) /Subtype /Link /Rect [552.021 593.8799999999998 563.76 608.1599999999999] /Type /Annot >> endobj -511 0 obj +512 0 obj << /Border [0 0 0] /Dest (_parameters_15) /Subtype /Link @@ -52332,7 +52157,7 @@ endobj /Type /Annot >> endobj -512 0 obj +513 0 obj << /Border [0 0 0] /Dest (_parameters_15) /Subtype /Link @@ -52340,7 +52165,7 @@ endobj /Type /Annot >> endobj -513 0 obj +514 0 obj << /Border [0 0 0] /Dest (_responses_21) /Subtype /Link @@ -52348,7 +52173,7 @@ endobj /Type /Annot >> endobj -514 0 obj +515 0 obj << /Border [0 0 0] /Dest (_responses_21) /Subtype /Link @@ -52356,7 +52181,7 @@ endobj /Type /Annot >> endobj -515 0 obj +516 0 obj << /Border [0 0 0] /Dest (_produces_20) /Subtype /Link @@ -52364,7 +52189,7 @@ endobj /Type /Annot >> endobj -516 0 obj +517 0 obj << /Border [0 0 0] /Dest (_produces_20) /Subtype /Link @@ -52372,23 +52197,23 @@ endobj /Type /Annot >> endobj -517 0 obj +518 0 obj << /Border [0 0 0] -/Dest (_route121) +/Dest (_route13) /Subtype /Link /Rect [60.24000000000001 519.9599999999998 249.70200000000003 534.2399999999998] /Type /Annot >> endobj -518 0 obj +519 0 obj << /Border [0 0 0] -/Dest (_route121) +/Dest (_route13) /Subtype /Link /Rect [552.021 519.9599999999998 563.76 534.2399999999998] /Type /Annot >> endobj -519 0 obj +520 0 obj << /Border [0 0 0] /Dest (_parameters_16) /Subtype /Link @@ -52396,7 +52221,7 @@ endobj /Type /Annot >> endobj -520 0 obj +521 0 obj << /Border [0 0 0] /Dest (_parameters_16) /Subtype /Link @@ -52404,7 +52229,7 @@ endobj /Type /Annot >> endobj -521 0 obj +522 0 obj << /Border [0 0 0] /Dest (_responses_22) /Subtype /Link @@ -52412,7 +52237,7 @@ endobj /Type /Annot >> endobj -522 0 obj +523 0 obj << /Border [0 0 0] /Dest (_responses_22) /Subtype /Link @@ -52420,7 +52245,7 @@ endobj /Type /Annot >> endobj -523 0 obj +524 0 obj << /Border [0 0 0] /Dest (_produces_21) /Subtype /Link @@ -52428,7 +52253,7 @@ endobj /Type /Annot >> endobj -524 0 obj +525 0 obj << /Border [0 0 0] /Dest (_produces_21) /Subtype /Link @@ -52436,23 +52261,23 @@ endobj /Type /Annot >> endobj -525 0 obj +526 0 obj << /Border [0 0 0] -/Dest (_route118) +/Dest (_route10) /Subtype /Link /Rect [60.24000000000001 446.03999999999974 261.860794921875 460.3199999999997] /Type /Annot >> endobj -526 0 obj +527 0 obj << /Border [0 0 0] -/Dest (_route118) +/Dest (_route10) /Subtype /Link /Rect [552.021 446.03999999999974 563.76 460.3199999999997] /Type /Annot >> endobj -527 0 obj +528 0 obj << /Border [0 0 0] /Dest (_parameters_17) /Subtype /Link @@ -52460,7 +52285,7 @@ endobj /Type /Annot >> endobj -528 0 obj +529 0 obj << /Border [0 0 0] /Dest (_parameters_17) /Subtype /Link @@ -52468,7 +52293,7 @@ endobj /Type /Annot >> endobj -529 0 obj +530 0 obj << /Border [0 0 0] /Dest (_responses_23) /Subtype /Link @@ -52476,7 +52301,7 @@ endobj /Type /Annot >> endobj -530 0 obj +531 0 obj << /Border [0 0 0] /Dest (_responses_23) /Subtype /Link @@ -52484,7 +52309,7 @@ endobj /Type /Annot >> endobj -531 0 obj +532 0 obj << /Border [0 0 0] /Dest (_produces_22) /Subtype /Link @@ -52492,7 +52317,7 @@ endobj /Type /Annot >> endobj -532 0 obj +533 0 obj << /Border [0 0 0] /Dest (_produces_22) /Subtype /Link @@ -52500,23 +52325,23 @@ endobj /Type /Annot >> endobj -533 0 obj +534 0 obj << /Border [0 0 0] -/Dest (_route112) +/Dest (_route4) /Subtype /Link /Rect [60.24000000000001 372.11999999999966 339.560794921875 386.39999999999964] /Type /Annot >> endobj -534 0 obj +535 0 obj << /Border [0 0 0] -/Dest (_route112) +/Dest (_route4) /Subtype /Link /Rect [552.021 372.11999999999966 563.76 386.39999999999964] /Type /Annot >> endobj -535 0 obj +536 0 obj << /Border [0 0 0] /Dest (_parameters_18) /Subtype /Link @@ -52524,7 +52349,7 @@ endobj /Type /Annot >> endobj -536 0 obj +537 0 obj << /Border [0 0 0] /Dest (_parameters_18) /Subtype /Link @@ -52532,7 +52357,7 @@ endobj /Type /Annot >> endobj -537 0 obj +538 0 obj << /Border [0 0 0] /Dest (_responses_24) /Subtype /Link @@ -52540,7 +52365,7 @@ endobj /Type /Annot >> endobj -538 0 obj +539 0 obj << /Border [0 0 0] /Dest (_responses_24) /Subtype /Link @@ -52548,7 +52373,7 @@ endobj /Type /Annot >> endobj -539 0 obj +540 0 obj << /Border [0 0 0] /Dest (_consumes_4) /Subtype /Link @@ -52556,7 +52381,7 @@ endobj /Type /Annot >> endobj -540 0 obj +541 0 obj << /Border [0 0 0] /Dest (_consumes_4) /Subtype /Link @@ -52564,7 +52389,7 @@ endobj /Type /Annot >> endobj -541 0 obj +542 0 obj << /Border [0 0 0] /Dest (_produces_23) /Subtype /Link @@ -52572,7 +52397,7 @@ endobj /Type /Annot >> endobj -542 0 obj +543 0 obj << /Border [0 0 0] /Dest (_produces_23) /Subtype /Link @@ -52580,23 +52405,23 @@ endobj /Type /Annot >> endobj -543 0 obj +544 0 obj << /Border [0 0 0] -/Dest (_route114) +/Dest (_route6) /Subtype /Link /Rect [60.24000000000001 279.7199999999996 350.38629492187505 293.99999999999955] /Type /Annot >> endobj -544 0 obj +545 0 obj << /Border [0 0 0] -/Dest (_route114) +/Dest (_route6) /Subtype /Link /Rect [552.021 279.7199999999996 563.76 293.99999999999955] /Type /Annot >> endobj -545 0 obj +546 0 obj << /Border [0 0 0] /Dest (_parameters_19) /Subtype /Link @@ -52604,7 +52429,7 @@ endobj /Type /Annot >> endobj -546 0 obj +547 0 obj << /Border [0 0 0] /Dest (_parameters_19) /Subtype /Link @@ -52612,7 +52437,7 @@ endobj /Type /Annot >> endobj -547 0 obj +548 0 obj << /Border [0 0 0] /Dest (_responses_25) /Subtype /Link @@ -52620,7 +52445,7 @@ endobj /Type /Annot >> endobj -548 0 obj +549 0 obj << /Border [0 0 0] /Dest (_responses_25) /Subtype /Link @@ -52628,7 +52453,7 @@ endobj /Type /Annot >> endobj -549 0 obj +550 0 obj << /Border [0 0 0] /Dest (_consumes_5) /Subtype /Link @@ -52636,7 +52461,7 @@ endobj /Type /Annot >> endobj -550 0 obj +551 0 obj << /Border [0 0 0] /Dest (_consumes_5) /Subtype /Link @@ -52644,7 +52469,7 @@ endobj /Type /Annot >> endobj -551 0 obj +552 0 obj << /Border [0 0 0] /Dest (_produces_24) /Subtype /Link @@ -52652,7 +52477,7 @@ endobj /Type /Annot >> endobj -552 0 obj +553 0 obj << /Border [0 0 0] /Dest (_produces_24) /Subtype /Link @@ -52660,23 +52485,23 @@ endobj /Type /Annot >> endobj -553 0 obj +554 0 obj << /Border [0 0 0] -/Dest (_route113) +/Dest (_route5) /Subtype /Link /Rect [60.24000000000001 187.31999999999954 352.81158984375 201.59999999999954] /Type /Annot >> endobj -554 0 obj +555 0 obj << /Border [0 0 0] -/Dest (_route113) +/Dest (_route5) /Subtype /Link /Rect [552.021 187.31999999999954 563.76 201.59999999999954] /Type /Annot >> endobj -555 0 obj +556 0 obj << /Border [0 0 0] /Dest (_parameters_20) /Subtype /Link @@ -52684,7 +52509,7 @@ endobj /Type /Annot >> endobj -556 0 obj +557 0 obj << /Border [0 0 0] /Dest (_parameters_20) /Subtype /Link @@ -52692,7 +52517,7 @@ endobj /Type /Annot >> endobj -557 0 obj +558 0 obj << /Border [0 0 0] /Dest (_responses_26) /Subtype /Link @@ -52700,7 +52525,7 @@ endobj /Type /Annot >> endobj -558 0 obj +559 0 obj << /Border [0 0 0] /Dest (_responses_26) /Subtype /Link @@ -52708,7 +52533,7 @@ endobj /Type /Annot >> endobj -559 0 obj +560 0 obj << /Border [0 0 0] /Dest (_consumes_6) /Subtype /Link @@ -52716,7 +52541,7 @@ endobj /Type /Annot >> endobj -560 0 obj +561 0 obj << /Border [0 0 0] /Dest (_consumes_6) /Subtype /Link @@ -52724,7 +52549,7 @@ endobj /Type /Annot >> endobj -561 0 obj +562 0 obj << /Border [0 0 0] /Dest (_produces_25) /Subtype /Link @@ -52732,7 +52557,7 @@ endobj /Type /Annot >> endobj -562 0 obj +563 0 obj << /Border [0 0 0] /Dest (_produces_25) /Subtype /Link @@ -52740,23 +52565,23 @@ endobj /Type /Annot >> endobj -563 0 obj +564 0 obj << /Border [0 0 0] -/Dest (_route111) +/Dest (_route3) /Subtype /Link /Rect [60.24000000000001 94.91999999999959 212.0595 109.19999999999959] /Type /Annot >> endobj -564 0 obj +565 0 obj << /Border [0 0 0] -/Dest (_route111) +/Dest (_route3) /Subtype /Link /Rect [552.021 94.91999999999959 563.76 109.19999999999959] /Type /Annot >> endobj -565 0 obj +566 0 obj << /Border [0 0 0] /Dest (_parameters_21) /Subtype /Link @@ -52764,7 +52589,7 @@ endobj /Type /Annot >> endobj -566 0 obj +567 0 obj << /Border [0 0 0] /Dest (_parameters_21) /Subtype /Link @@ -52772,7 +52597,7 @@ endobj /Type /Annot >> endobj -567 0 obj +568 0 obj << /Border [0 0 0] /Dest (_responses_27) /Subtype /Link @@ -52780,7 +52605,7 @@ endobj /Type /Annot >> endobj -568 0 obj +569 0 obj << /Border [0 0 0] /Dest (_responses_27) /Subtype /Link @@ -52788,7 +52613,7 @@ endobj /Type /Annot >> endobj -569 0 obj +570 0 obj << /Border [0 0 0] /Dest (_produces_26) /Subtype /Link @@ -52796,7 +52621,7 @@ endobj /Type /Annot >> endobj -570 0 obj +571 0 obj << /Border [0 0 0] /Dest (_produces_26) /Subtype /Link @@ -52804,23 +52629,23 @@ endobj /Type /Annot >> endobj -571 0 obj +572 0 obj << /Border [0 0 0] -/Dest (_route137) +/Dest (_route29) /Subtype /Link /Rect [60.24000000000001 723.2399999999999 226.68805078125 737.52] /Type /Annot >> endobj -572 0 obj +573 0 obj << /Border [0 0 0] -/Dest (_route137) +/Dest (_route29) /Subtype /Link /Rect [552.021 723.2399999999999 563.76 737.52] /Type /Annot >> endobj -573 0 obj +574 0 obj << /Border [0 0 0] /Dest (_parameters_22) /Subtype /Link @@ -52828,7 +52653,7 @@ endobj /Type /Annot >> endobj -574 0 obj +575 0 obj << /Border [0 0 0] /Dest (_parameters_22) /Subtype /Link @@ -52836,7 +52661,7 @@ endobj /Type /Annot >> endobj -575 0 obj +576 0 obj << /Border [0 0 0] /Dest (_responses_28) /Subtype /Link @@ -52844,7 +52669,7 @@ endobj /Type /Annot >> endobj -576 0 obj +577 0 obj << /Border [0 0 0] /Dest (_responses_28) /Subtype /Link @@ -52852,7 +52677,7 @@ endobj /Type /Annot >> endobj -577 0 obj +578 0 obj << /Border [0 0 0] /Dest (_consumes_7) /Subtype /Link @@ -52860,7 +52685,7 @@ endobj /Type /Annot >> endobj -578 0 obj +579 0 obj << /Border [0 0 0] /Dest (_consumes_7) /Subtype /Link @@ -52868,7 +52693,7 @@ endobj /Type /Annot >> endobj -579 0 obj +580 0 obj << /Border [0 0 0] /Dest (_produces_27) /Subtype /Link @@ -52876,7 +52701,7 @@ endobj /Type /Annot >> endobj -580 0 obj +581 0 obj << /Border [0 0 0] /Dest (_produces_27) /Subtype /Link @@ -52884,23 +52709,23 @@ endobj /Type /Annot >> endobj -581 0 obj +582 0 obj << /Border [0 0 0] -/Dest (_route134) +/Dest (_route26) /Subtype /Link /Rect [60.24000000000001 630.8399999999998 221.091755859375 645.1199999999999] /Type /Annot >> endobj -582 0 obj +583 0 obj << /Border [0 0 0] -/Dest (_route134) +/Dest (_route26) /Subtype /Link /Rect [552.021 630.8399999999998 563.76 645.1199999999999] /Type /Annot >> endobj -583 0 obj +584 0 obj << /Border [0 0 0] /Dest (_responses_29) /Subtype /Link @@ -52908,7 +52733,7 @@ endobj /Type /Annot >> endobj -584 0 obj +585 0 obj << /Border [0 0 0] /Dest (_responses_29) /Subtype /Link @@ -52916,7 +52741,7 @@ endobj /Type /Annot >> endobj -585 0 obj +586 0 obj << /Border [0 0 0] /Dest (_produces_28) /Subtype /Link @@ -52924,7 +52749,7 @@ endobj /Type /Annot >> endobj -586 0 obj +587 0 obj << /Border [0 0 0] /Dest (_produces_28) /Subtype /Link @@ -52932,23 +52757,23 @@ endobj /Type /Annot >> endobj -587 0 obj +588 0 obj << /Border [0 0 0] -/Dest (_route136) +/Dest (_route28) /Subtype /Link /Rect [60.24000000000001 575.3999999999997 458.24414062500006 589.6799999999998] /Type /Annot >> endobj -588 0 obj +589 0 obj << /Border [0 0 0] -/Dest (_route136) +/Dest (_route28) /Subtype /Link /Rect [552.021 575.3999999999997 563.76 589.6799999999998] /Type /Annot >> endobj -589 0 obj +590 0 obj << /Border [0 0 0] /Dest (_parameters_23) /Subtype /Link @@ -52956,7 +52781,7 @@ endobj /Type /Annot >> endobj -590 0 obj +591 0 obj << /Border [0 0 0] /Dest (_parameters_23) /Subtype /Link @@ -52964,7 +52789,7 @@ endobj /Type /Annot >> endobj -591 0 obj +592 0 obj << /Border [0 0 0] /Dest (_responses_30) /Subtype /Link @@ -52972,7 +52797,7 @@ endobj /Type /Annot >> endobj -592 0 obj +593 0 obj << /Border [0 0 0] /Dest (_responses_30) /Subtype /Link @@ -52980,7 +52805,7 @@ endobj /Type /Annot >> endobj -593 0 obj +594 0 obj << /Border [0 0 0] /Dest (_produces_29) /Subtype /Link @@ -52988,7 +52813,7 @@ endobj /Type /Annot >> endobj -594 0 obj +595 0 obj << /Border [0 0 0] /Dest (_produces_29) /Subtype /Link @@ -52996,23 +52821,23 @@ endobj /Type /Annot >> endobj -595 0 obj +596 0 obj << /Border [0 0 0] -/Dest (_route135) +/Dest (_route27) /Subtype /Link /Rect [60.24000000000001 501.4799999999998 430.23014062500005 515.7599999999998] /Type /Annot >> endobj -596 0 obj +597 0 obj << /Border [0 0 0] -/Dest (_route135) +/Dest (_route27) /Subtype /Link /Rect [552.021 501.4799999999998 563.76 515.7599999999998] /Type /Annot >> endobj -597 0 obj +598 0 obj << /Border [0 0 0] /Dest (_parameters_24) /Subtype /Link @@ -53020,7 +52845,7 @@ endobj /Type /Annot >> endobj -598 0 obj +599 0 obj << /Border [0 0 0] /Dest (_parameters_24) /Subtype /Link @@ -53028,7 +52853,7 @@ endobj /Type /Annot >> endobj -599 0 obj +600 0 obj << /Border [0 0 0] /Dest (_responses_31) /Subtype /Link @@ -53036,7 +52861,7 @@ endobj /Type /Annot >> endobj -600 0 obj +601 0 obj << /Border [0 0 0] /Dest (_responses_31) /Subtype /Link @@ -53044,7 +52869,7 @@ endobj /Type /Annot >> endobj -601 0 obj +602 0 obj << /Border [0 0 0] /Dest (_produces_30) /Subtype /Link @@ -53052,7 +52877,7 @@ endobj /Type /Annot >> endobj -602 0 obj +603 0 obj << /Border [0 0 0] /Dest (_produces_30) /Subtype /Link @@ -53060,23 +52885,23 @@ endobj /Type /Annot >> endobj -603 0 obj +604 0 obj << /Border [0 0 0] -/Dest (_route138) +/Dest (_route30) /Subtype /Link /Rect [60.24000000000001 427.5599999999997 430.06214062500004 441.8399999999997] /Type /Annot >> endobj -604 0 obj +605 0 obj << /Border [0 0 0] -/Dest (_route138) +/Dest (_route30) /Subtype /Link /Rect [552.021 427.5599999999997 563.76 441.8399999999997] /Type /Annot >> endobj -605 0 obj +606 0 obj << /Border [0 0 0] /Dest (_parameters_25) /Subtype /Link @@ -53084,7 +52909,7 @@ endobj /Type /Annot >> endobj -606 0 obj +607 0 obj << /Border [0 0 0] /Dest (_parameters_25) /Subtype /Link @@ -53092,7 +52917,7 @@ endobj /Type /Annot >> endobj -607 0 obj +608 0 obj << /Border [0 0 0] /Dest (_responses_32) /Subtype /Link @@ -53100,7 +52925,7 @@ endobj /Type /Annot >> endobj -608 0 obj +609 0 obj << /Border [0 0 0] /Dest (_responses_32) /Subtype /Link @@ -53108,7 +52933,7 @@ endobj /Type /Annot >> endobj -609 0 obj +610 0 obj << /Border [0 0 0] /Dest (_consumes_8) /Subtype /Link @@ -53116,7 +52941,7 @@ endobj /Type /Annot >> endobj -610 0 obj +611 0 obj << /Border [0 0 0] /Dest (_consumes_8) /Subtype /Link @@ -53124,7 +52949,7 @@ endobj /Type /Annot >> endobj -611 0 obj +612 0 obj << /Border [0 0 0] /Dest (_produces_31) /Subtype /Link @@ -53132,7 +52957,7 @@ endobj /Type /Annot >> endobj -612 0 obj +613 0 obj << /Border [0 0 0] /Dest (_produces_31) /Subtype /Link @@ -53140,23 +52965,23 @@ endobj /Type /Annot >> endobj -613 0 obj +614 0 obj << /Border [0 0 0] -/Dest (_route139) +/Dest (_route31) /Subtype /Link /Rect [60.24000000000001 335.1599999999996 175.8555 349.4399999999996] /Type /Annot >> endobj -614 0 obj +615 0 obj << /Border [0 0 0] -/Dest (_route139) +/Dest (_route31) /Subtype /Link /Rect [552.021 335.1599999999996 563.76 349.4399999999996] /Type /Annot >> endobj -615 0 obj +616 0 obj << /Border [0 0 0] /Dest (_responses_33) /Subtype /Link @@ -53164,7 +52989,7 @@ endobj /Type /Annot >> endobj -616 0 obj +617 0 obj << /Border [0 0 0] /Dest (_responses_33) /Subtype /Link @@ -53172,7 +52997,7 @@ endobj /Type /Annot >> endobj -617 0 obj +618 0 obj << /Border [0 0 0] /Dest (_produces_32) /Subtype /Link @@ -53180,7 +53005,7 @@ endobj /Type /Annot >> endobj -618 0 obj +619 0 obj << /Border [0 0 0] /Dest (_produces_32) /Subtype /Link @@ -53188,23 +53013,23 @@ endobj /Type /Annot >> endobj -619 0 obj +620 0 obj << /Border [0 0 0] -/Dest (_route141) +/Dest (_route33) /Subtype /Link /Rect [60.24000000000001 279.7199999999996 211.818 293.99999999999955] /Type /Annot >> endobj -620 0 obj +621 0 obj << /Border [0 0 0] -/Dest (_route141) +/Dest (_route33) /Subtype /Link /Rect [552.021 279.7199999999996 563.76 293.99999999999955] /Type /Annot >> endobj -621 0 obj +622 0 obj << /Border [0 0 0] /Dest (_responses_34) /Subtype /Link @@ -53212,7 +53037,7 @@ endobj /Type /Annot >> endobj -622 0 obj +623 0 obj << /Border [0 0 0] /Dest (_responses_34) /Subtype /Link @@ -53220,7 +53045,7 @@ endobj /Type /Annot >> endobj -623 0 obj +624 0 obj << /Border [0 0 0] /Dest (_produces_33) /Subtype /Link @@ -53228,7 +53053,7 @@ endobj /Type /Annot >> endobj -624 0 obj +625 0 obj << /Border [0 0 0] /Dest (_produces_33) /Subtype /Link @@ -53236,23 +53061,23 @@ endobj /Type /Annot >> endobj -625 0 obj +626 0 obj << /Border [0 0 0] -/Dest (_route140) +/Dest (_route32) /Subtype /Link /Rect [60.24000000000001 224.27999999999952 261.44100000000003 238.55999999999952] /Type /Annot >> endobj -626 0 obj +627 0 obj << /Border [0 0 0] -/Dest (_route140) +/Dest (_route32) /Subtype /Link /Rect [552.021 224.27999999999952 563.76 238.55999999999952] /Type /Annot >> endobj -627 0 obj +628 0 obj << /Border [0 0 0] /Dest (_parameters_26) /Subtype /Link @@ -53260,7 +53085,7 @@ endobj /Type /Annot >> endobj -628 0 obj +629 0 obj << /Border [0 0 0] /Dest (_parameters_26) /Subtype /Link @@ -53268,7 +53093,7 @@ endobj /Type /Annot >> endobj -629 0 obj +630 0 obj << /Border [0 0 0] /Dest (_responses_35) /Subtype /Link @@ -53276,7 +53101,7 @@ endobj /Type /Annot >> endobj -630 0 obj +631 0 obj << /Border [0 0 0] /Dest (_responses_35) /Subtype /Link @@ -53284,7 +53109,7 @@ endobj /Type /Annot >> endobj -631 0 obj +632 0 obj << /Border [0 0 0] /Dest (_produces_34) /Subtype /Link @@ -53292,7 +53117,7 @@ endobj /Type /Annot >> endobj -632 0 obj +633 0 obj << /Border [0 0 0] /Dest (_produces_34) /Subtype /Link @@ -53300,7 +53125,7 @@ endobj /Type /Annot >> endobj -633 0 obj +634 0 obj << /Border [0 0 0] /Dest (_definitions) /Subtype /Link @@ -53308,7 +53133,7 @@ endobj /Type /Annot >> endobj -634 0 obj +635 0 obj << /Border [0 0 0] /Dest (_definitions) /Subtype /Link @@ -53316,7 +53141,7 @@ endobj /Type /Annot >> endobj -635 0 obj +636 0 obj << /Border [0 0 0] /Dest (_clampinformation) /Subtype /Link @@ -53324,7 +53149,7 @@ endobj /Type /Annot >> endobj -636 0 obj +637 0 obj << /Border [0 0 0] /Dest (_clampinformation) /Subtype /Link @@ -53332,7 +53157,7 @@ endobj /Type /Annot >> endobj -637 0 obj +638 0 obj << /Border [0 0 0] /Dest (_cldshealthcheck) /Subtype /Link @@ -53340,7 +53165,7 @@ endobj /Type /Annot >> endobj -638 0 obj +639 0 obj << /Border [0 0 0] /Dest (_cldshealthcheck) /Subtype /Link @@ -53348,7 +53173,7 @@ endobj /Type /Annot >> endobj -639 0 obj +640 0 obj << /Border [0 0 0] /Dest (_dictionary) /Subtype /Link @@ -53356,7 +53181,7 @@ endobj /Type /Annot >> endobj -640 0 obj +641 0 obj << /Border [0 0 0] /Dest (_dictionary) /Subtype /Link @@ -53364,7 +53189,7 @@ endobj /Type /Annot >> endobj -641 0 obj +642 0 obj << /Border [0 0 0] /Dest (_dictionaryelement) /Subtype /Link @@ -53372,7 +53197,7 @@ endobj /Type /Annot >> endobj -642 0 obj +643 0 obj << /Border [0 0 0] /Dest (_dictionaryelement) /Subtype /Link @@ -53380,7 +53205,7 @@ endobj /Type /Annot >> endobj -643 0 obj +644 0 obj << /Border [0 0 0] /Dest (_externalcomponent) /Subtype /Link @@ -53388,7 +53213,7 @@ endobj /Type /Annot >> endobj -644 0 obj +645 0 obj << /Border [0 0 0] /Dest (_externalcomponent) /Subtype /Link @@ -53396,7 +53221,7 @@ endobj /Type /Annot >> endobj -645 0 obj +646 0 obj << /Border [0 0 0] /Dest (_externalcomponentstate) /Subtype /Link @@ -53404,7 +53229,7 @@ endobj /Type /Annot >> endobj -646 0 obj +647 0 obj << /Border [0 0 0] /Dest (_externalcomponentstate) /Subtype /Link @@ -53412,7 +53237,7 @@ endobj /Type /Annot >> endobj -647 0 obj +648 0 obj << /Border [0 0 0] /Dest (_jsonarray) /Subtype /Link @@ -53420,7 +53245,7 @@ endobj /Type /Annot >> endobj -648 0 obj +649 0 obj << /Border [0 0 0] /Dest (_jsonarray) /Subtype /Link @@ -53428,7 +53253,7 @@ endobj /Type /Annot >> endobj -649 0 obj +650 0 obj << /Border [0 0 0] /Dest (_jsonnull) /Subtype /Link @@ -53436,7 +53261,7 @@ endobj /Type /Annot >> endobj -650 0 obj +651 0 obj << /Border [0 0 0] /Dest (_jsonnull) /Subtype /Link @@ -53444,7 +53269,7 @@ endobj /Type /Annot >> endobj -651 0 obj +652 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link @@ -53452,7 +53277,7 @@ endobj /Type /Annot >> endobj -652 0 obj +653 0 obj << /Border [0 0 0] /Dest (_jsonobject) /Subtype /Link @@ -53460,7 +53285,7 @@ endobj /Type /Annot >> endobj -653 0 obj +654 0 obj << /Border [0 0 0] /Dest (_jsonprimitive) /Subtype /Link @@ -53468,7 +53293,7 @@ endobj /Type /Annot >> endobj -654 0 obj +655 0 obj << /Border [0 0 0] /Dest (_jsonprimitive) /Subtype /Link @@ -53476,7 +53301,7 @@ endobj /Type /Annot >> endobj -655 0 obj +656 0 obj << /Border [0 0 0] /Dest (_loop) /Subtype /Link @@ -53484,7 +53309,7 @@ endobj /Type /Annot >> endobj -656 0 obj +657 0 obj << /Border [0 0 0] /Dest (_loop) /Subtype /Link @@ -53492,7 +53317,7 @@ endobj /Type /Annot >> endobj -657 0 obj +658 0 obj << /Border [0 0 0] /Dest (_loopelementmodel) /Subtype /Link @@ -53500,7 +53325,7 @@ endobj /Type /Annot >> endobj -658 0 obj +659 0 obj << /Border [0 0 0] /Dest (_loopelementmodel) /Subtype /Link @@ -53508,7 +53333,7 @@ endobj /Type /Annot >> endobj -659 0 obj +660 0 obj << /Border [0 0 0] /Dest (_looplog) /Subtype /Link @@ -53516,7 +53341,7 @@ endobj /Type /Annot >> endobj -660 0 obj +661 0 obj << /Border [0 0 0] /Dest (_looplog) /Subtype /Link @@ -53524,7 +53349,7 @@ endobj /Type /Annot >> endobj -661 0 obj +662 0 obj << /Border [0 0 0] /Dest (_looptemplate) /Subtype /Link @@ -53532,7 +53357,7 @@ endobj /Type /Annot >> endobj -662 0 obj +663 0 obj << /Border [0 0 0] /Dest (_looptemplate) /Subtype /Link @@ -53540,7 +53365,7 @@ endobj /Type /Annot >> endobj -663 0 obj +664 0 obj << /Border [0 0 0] /Dest (_looptemplateloopelementmodel) /Subtype /Link @@ -53548,7 +53373,7 @@ endobj /Type /Annot >> endobj -664 0 obj +665 0 obj << /Border [0 0 0] /Dest (_looptemplateloopelementmodel) /Subtype /Link @@ -53556,7 +53381,7 @@ endobj /Type /Annot >> endobj -665 0 obj +666 0 obj << /Border [0 0 0] /Dest (_microservicepolicy) /Subtype /Link @@ -53564,7 +53389,7 @@ endobj /Type /Annot >> endobj -666 0 obj +667 0 obj << /Border [0 0 0] /Dest (_microservicepolicy) /Subtype /Link @@ -53572,7 +53397,7 @@ endobj /Type /Annot >> endobj -667 0 obj +668 0 obj << /Border [0 0 0] /Dest (_number) /Subtype /Link @@ -53580,7 +53405,7 @@ endobj /Type /Annot >> endobj -668 0 obj +669 0 obj << /Border [0 0 0] /Dest (_number) /Subtype /Link @@ -53588,7 +53413,7 @@ endobj /Type /Annot >> endobj -669 0 obj +670 0 obj << /Border [0 0 0] /Dest (_operationalpolicy) /Subtype /Link @@ -53596,7 +53421,7 @@ endobj /Type /Annot >> endobj -670 0 obj +671 0 obj << /Border [0 0 0] /Dest (_operationalpolicy) /Subtype /Link @@ -53604,7 +53429,7 @@ endobj /Type /Annot >> endobj -671 0 obj +672 0 obj << /Border [0 0 0] /Dest (_policymodel) /Subtype /Link @@ -53612,7 +53437,7 @@ endobj /Type /Annot >> endobj -672 0 obj +673 0 obj << /Border [0 0 0] /Dest (_policymodel) /Subtype /Link @@ -53620,7 +53445,7 @@ endobj /Type /Annot >> endobj -673 0 obj +674 0 obj << /Border [0 0 0] /Dest (_service) /Subtype /Link @@ -53628,7 +53453,7 @@ endobj /Type /Annot >> endobj -674 0 obj +675 0 obj << /Border [0 0 0] /Dest (_service) /Subtype /Link @@ -53636,7 +53461,7 @@ endobj /Type /Annot >> endobj -675 0 obj +676 0 obj << /Type /XObject /Subtype /Form /BBox [0 0 612.0 792.0] @@ -53664,1497 +53489,1497 @@ Q endstream endobj -676 0 obj +677 0 obj << /Type /Outlines /Count 165 -/First 677 0 R -/Last 821 0 R +/First 678 0 R +/Last 822 0 R >> endobj -677 0 obj +678 0 obj << /Title -/Parent 676 0 R +/Parent 677 0 R /Count 0 -/Next 678 0 R +/Next 679 0 R /Dest [7 0 R /XYZ 0 792.0 null] >> endobj -678 0 obj +679 0 obj << /Title -/Parent 676 0 R +/Parent 677 0 R /Count 0 -/Next 679 0 R -/Prev 677 0 R +/Next 680 0 R +/Prev 678 0 R /Dest [10 0 R /XYZ 0 792.0 null] >> endobj -679 0 obj +680 0 obj << /Title -/Parent 676 0 R +/Parent 677 0 R /Count 2 -/First 680 0 R -/Last 681 0 R -/Next 682 0 R -/Prev 678 0 R +/First 681 0 R +/Last 682 0 R +/Next 683 0 R +/Prev 679 0 R /Dest [20 0 R /XYZ 0 792.0 null] >> endobj -680 0 obj +681 0 obj << /Title -/Parent 679 0 R +/Parent 680 0 R /Count 0 -/Next 681 0 R +/Next 682 0 R /Dest [20 0 R /XYZ 0 712.0799999999999 null] >> endobj -681 0 obj +682 0 obj << /Title -/Parent 679 0 R +/Parent 680 0 R /Count 0 -/Prev 680 0 R +/Prev 681 0 R /Dest [20 0 R /XYZ 0 644.22 null] >> endobj -682 0 obj +683 0 obj << /Title -/Parent 676 0 R +/Parent 677 0 R /Count 138 -/First 683 0 R -/Last 817 0 R -/Next 821 0 R -/Prev 679 0 R +/First 684 0 R +/Last 818 0 R +/Next 822 0 R +/Prev 680 0 R /Dest [29 0 R /XYZ 0 792.0 null] >> endobj -683 0 obj +684 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 2 -/First 684 0 R -/Last 685 0 R -/Next 686 0 R +/First 685 0 R +/Last 686 0 R +/Next 687 0 R /Dest [29 0 R /XYZ 0 712.0799999999999 null] >> endobj -684 0 obj +685 0 obj << /Title -/Parent 683 0 R +/Parent 684 0 R /Count 0 -/Next 685 0 R +/Next 686 0 R /Dest [29 0 R /XYZ 0 672.0 null] >> endobj -685 0 obj +686 0 obj << /Title -/Parent 683 0 R +/Parent 684 0 R /Count 0 -/Prev 684 0 R +/Prev 685 0 R /Dest [29 0 R /XYZ 0 566.8800000000001 null] >> endobj -686 0 obj +687 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 2 -/First 687 0 R -/Last 688 0 R -/Next 689 0 R -/Prev 683 0 R +/First 688 0 R +/Last 689 0 R +/Next 690 0 R +/Prev 684 0 R /Dest [29 0 R /XYZ 0 510.60000000000025 null] >> endobj -687 0 obj +688 0 obj << /Title -/Parent 686 0 R +/Parent 687 0 R /Count 0 -/Next 688 0 R +/Next 689 0 R /Dest [29 0 R /XYZ 0 470.5200000000002 null] >> endobj -688 0 obj +689 0 obj << /Title -/Parent 686 0 R +/Parent 687 0 R /Count 0 -/Prev 687 0 R +/Prev 688 0 R /Dest [29 0 R /XYZ 0 379.6800000000002 null] >> endobj -689 0 obj +690 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 2 -/First 690 0 R -/Last 691 0 R -/Next 692 0 R -/Prev 686 0 R +/First 691 0 R +/Last 692 0 R +/Next 693 0 R +/Prev 687 0 R /Dest [29 0 R /XYZ 0 323.40000000000015 null] >> endobj -690 0 obj +691 0 obj << /Title -/Parent 689 0 R +/Parent 690 0 R /Count 0 -/Next 691 0 R +/Next 692 0 R /Dest [29 0 R /XYZ 0 283.3200000000001 null] >> endobj -691 0 obj +692 0 obj << /Title -/Parent 689 0 R +/Parent 690 0 R /Count 0 -/Prev 690 0 R +/Prev 691 0 R /Dest [29 0 R /XYZ 0 178.2000000000001 null] >> endobj -692 0 obj +693 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 2 -/First 693 0 R -/Last 694 0 R -/Next 695 0 R -/Prev 689 0 R +/First 694 0 R +/Last 695 0 R +/Next 696 0 R +/Prev 690 0 R /Dest [29 0 R /XYZ 0 121.92000000000007 null] >> endobj -693 0 obj +694 0 obj << /Title -/Parent 692 0 R +/Parent 693 0 R /Count 0 -/Next 694 0 R +/Next 695 0 R /Dest [45 0 R /XYZ 0 792.0 null] >> endobj -694 0 obj +695 0 obj << /Title -/Parent 692 0 R +/Parent 693 0 R /Count 0 -/Prev 693 0 R +/Prev 694 0 R /Dest [45 0 R /XYZ 0 653.2800000000002 null] >> endobj -695 0 obj +696 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 4 -/First 696 0 R -/Last 699 0 R -/Next 700 0 R -/Prev 692 0 R +/First 697 0 R +/Last 700 0 R +/Next 701 0 R +/Prev 693 0 R /Dest [45 0 R /XYZ 0 597.0000000000003 null] >> endobj -696 0 obj +697 0 obj << /Title -/Parent 695 0 R +/Parent 696 0 R /Count 0 -/Next 697 0 R +/Next 698 0 R /Dest [45 0 R /XYZ 0 556.9200000000004 null] >> endobj -697 0 obj +698 0 obj << /Title -/Parent 695 0 R +/Parent 696 0 R /Count 0 -/Next 698 0 R -/Prev 696 0 R +/Next 699 0 R +/Prev 697 0 R /Dest [45 0 R /XYZ 0 451.8000000000006 null] >> endobj -698 0 obj +699 0 obj << /Title -/Parent 695 0 R +/Parent 696 0 R /Count 0 -/Next 699 0 R -/Prev 697 0 R +/Next 700 0 R +/Prev 698 0 R /Dest [45 0 R /XYZ 0 346.6800000000005 null] >> endobj -699 0 obj +700 0 obj << /Title -/Parent 695 0 R +/Parent 696 0 R /Count 0 -/Prev 698 0 R +/Prev 699 0 R /Dest [45 0 R /XYZ 0 290.4000000000005 null] >> endobj -700 0 obj +701 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 2 -/First 701 0 R -/Last 702 0 R -/Next 703 0 R -/Prev 695 0 R +/First 702 0 R +/Last 703 0 R +/Next 704 0 R +/Prev 696 0 R /Dest [45 0 R /XYZ 0 234.12000000000046 null] >> endobj -701 0 obj +702 0 obj << /Title -/Parent 700 0 R +/Parent 701 0 R /Count 0 -/Next 702 0 R +/Next 703 0 R /Dest [45 0 R /XYZ 0 194.04000000000045 null] >> endobj -702 0 obj +703 0 obj << /Title -/Parent 700 0 R +/Parent 701 0 R /Count 0 -/Prev 701 0 R +/Prev 702 0 R /Dest [61 0 R /XYZ 0 792.0 null] >> endobj -703 0 obj +704 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 704 0 R -/Last 706 0 R -/Next 707 0 R -/Prev 700 0 R +/First 705 0 R +/Last 707 0 R +/Next 708 0 R +/Prev 701 0 R /Dest [61 0 R /XYZ 0 702.1200000000001 null] >> endobj -704 0 obj +705 0 obj << /Title -/Parent 703 0 R +/Parent 704 0 R /Count 0 -/Next 705 0 R +/Next 706 0 R /Dest [61 0 R /XYZ 0 662.0400000000002 null] >> endobj -705 0 obj +706 0 obj << /Title -/Parent 703 0 R +/Parent 704 0 R /Count 0 -/Next 706 0 R -/Prev 704 0 R +/Next 707 0 R +/Prev 705 0 R /Dest [61 0 R /XYZ 0 556.9200000000003 null] >> endobj -706 0 obj +707 0 obj << /Title -/Parent 703 0 R +/Parent 704 0 R /Count 0 -/Prev 705 0 R +/Prev 706 0 R /Dest [61 0 R /XYZ 0 451.8000000000004 null] >> endobj -707 0 obj +708 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 4 -/First 708 0 R -/Last 711 0 R -/Next 712 0 R -/Prev 703 0 R +/First 709 0 R +/Last 712 0 R +/Next 713 0 R +/Prev 704 0 R /Dest [61 0 R /XYZ 0 395.5200000000004 null] >> endobj -708 0 obj +709 0 obj << /Title -/Parent 707 0 R +/Parent 708 0 R /Count 0 -/Next 709 0 R +/Next 710 0 R /Dest [61 0 R /XYZ 0 355.44000000000034 null] >> endobj -709 0 obj +710 0 obj << /Title -/Parent 707 0 R +/Parent 708 0 R /Count 0 -/Next 710 0 R -/Prev 708 0 R +/Next 711 0 R +/Prev 709 0 R /Dest [61 0 R /XYZ 0 212.76000000000028 null] >> endobj -710 0 obj +711 0 obj << /Title -/Parent 707 0 R +/Parent 708 0 R /Count 0 -/Next 711 0 R -/Prev 709 0 R +/Next 712 0 R +/Prev 710 0 R /Dest [61 0 R /XYZ 0 107.64000000000024 null] >> endobj -711 0 obj +712 0 obj << /Title -/Parent 707 0 R +/Parent 708 0 R /Count 0 -/Prev 710 0 R +/Prev 711 0 R /Dest [75 0 R /XYZ 0 792.0 null] >> endobj -712 0 obj +713 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 713 0 R -/Last 715 0 R -/Next 716 0 R -/Prev 707 0 R +/First 714 0 R +/Last 716 0 R +/Next 717 0 R +/Prev 708 0 R /Dest [75 0 R /XYZ 0 702.1200000000001 null] >> endobj -713 0 obj +714 0 obj << /Title -/Parent 712 0 R +/Parent 713 0 R /Count 0 -/Next 714 0 R +/Next 715 0 R /Dest [75 0 R /XYZ 0 662.0400000000002 null] >> endobj -714 0 obj +715 0 obj << /Title -/Parent 712 0 R +/Parent 713 0 R /Count 0 -/Next 715 0 R -/Prev 713 0 R +/Next 716 0 R +/Prev 714 0 R /Dest [75 0 R /XYZ 0 556.9200000000003 null] >> endobj -715 0 obj +716 0 obj << /Title -/Parent 712 0 R +/Parent 713 0 R /Count 0 -/Prev 714 0 R +/Prev 715 0 R /Dest [75 0 R /XYZ 0 466.0800000000005 null] >> endobj -716 0 obj +717 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 717 0 R -/Last 719 0 R -/Next 720 0 R -/Prev 712 0 R +/First 718 0 R +/Last 720 0 R +/Next 721 0 R +/Prev 713 0 R /Dest [75 0 R /XYZ 0 409.80000000000047 null] >> endobj -717 0 obj +718 0 obj << /Title -/Parent 716 0 R +/Parent 717 0 R /Count 0 -/Next 718 0 R +/Next 719 0 R /Dest [75 0 R /XYZ 0 341.64000000000044 null] >> endobj -718 0 obj +719 0 obj << /Title -/Parent 716 0 R +/Parent 717 0 R /Count 0 -/Next 719 0 R -/Prev 717 0 R +/Next 720 0 R +/Prev 718 0 R /Dest [75 0 R /XYZ 0 198.9600000000004 null] >> endobj -719 0 obj +720 0 obj << /Title -/Parent 716 0 R +/Parent 717 0 R /Count 0 -/Prev 718 0 R +/Prev 719 0 R /Dest [75 0 R /XYZ 0 108.12000000000037 null] >> endobj -720 0 obj +721 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 721 0 R -/Last 723 0 R -/Next 724 0 R -/Prev 716 0 R +/First 722 0 R +/Last 724 0 R +/Next 725 0 R +/Prev 717 0 R /Dest [87 0 R /XYZ 0 792.0 null] >> endobj -721 0 obj +722 0 obj << /Title -/Parent 720 0 R +/Parent 721 0 R /Count 0 -/Next 722 0 R +/Next 723 0 R /Dest [87 0 R /XYZ 0 662.1600000000001 null] >> endobj -722 0 obj +723 0 obj << /Title -/Parent 720 0 R +/Parent 721 0 R /Count 0 -/Next 723 0 R -/Prev 721 0 R +/Next 724 0 R +/Prev 722 0 R /Dest [87 0 R /XYZ 0 481.92000000000024 null] >> endobj -723 0 obj +724 0 obj << /Title -/Parent 720 0 R +/Parent 721 0 R /Count 0 -/Prev 722 0 R +/Prev 723 0 R /Dest [87 0 R /XYZ 0 376.8000000000002 null] >> endobj -724 0 obj +725 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 4 -/First 725 0 R -/Last 728 0 R -/Next 729 0 R -/Prev 720 0 R +/First 726 0 R +/Last 729 0 R +/Next 730 0 R +/Prev 721 0 R /Dest [87 0 R /XYZ 0 320.52000000000015 null] >> endobj -725 0 obj +726 0 obj << /Title -/Parent 724 0 R +/Parent 725 0 R /Count 0 -/Next 726 0 R +/Next 727 0 R /Dest [87 0 R /XYZ 0 224.28000000000017 null] >> endobj -726 0 obj +727 0 obj << /Title -/Parent 724 0 R +/Parent 725 0 R /Count 0 -/Next 727 0 R -/Prev 725 0 R +/Next 728 0 R +/Prev 726 0 R /Dest [87 0 R /XYZ 0 104.88000000000014 null] >> endobj -727 0 obj +728 0 obj << /Title -/Parent 724 0 R +/Parent 725 0 R /Count 0 -/Next 728 0 R -/Prev 726 0 R +/Next 729 0 R +/Prev 727 0 R /Dest [98 0 R /XYZ 0 683.1600000000001 null] >> endobj -728 0 obj +729 0 obj << /Title -/Parent 724 0 R +/Parent 725 0 R /Count 0 -/Prev 727 0 R +/Prev 728 0 R /Dest [98 0 R /XYZ 0 626.8800000000002 null] >> endobj -729 0 obj +730 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 2 -/First 730 0 R -/Last 731 0 R -/Next 732 0 R -/Prev 724 0 R +/First 731 0 R +/Last 732 0 R +/Next 733 0 R +/Prev 725 0 R /Dest [98 0 R /XYZ 0 570.6000000000004 null] >> endobj -730 0 obj +731 0 obj << /Title -/Parent 729 0 R +/Parent 730 0 R /Count 0 -/Next 731 0 R +/Next 732 0 R /Dest [98 0 R /XYZ 0 530.5200000000004 null] >> endobj -731 0 obj +732 0 obj << /Title -/Parent 729 0 R +/Parent 730 0 R /Count 0 -/Prev 730 0 R +/Prev 731 0 R /Dest [98 0 R /XYZ 0 425.4000000000005 null] >> endobj -732 0 obj +733 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 733 0 R -/Last 735 0 R -/Next 736 0 R -/Prev 729 0 R +/First 734 0 R +/Last 736 0 R +/Next 737 0 R +/Prev 730 0 R /Dest [98 0 R /XYZ 0 334.5600000000005 null] >> endobj -733 0 obj +734 0 obj << /Title -/Parent 732 0 R +/Parent 733 0 R /Count 0 -/Next 734 0 R +/Next 735 0 R /Dest [98 0 R /XYZ 0 294.4800000000005 null] >> endobj -734 0 obj +735 0 obj << /Title -/Parent 732 0 R +/Parent 733 0 R /Count 0 -/Next 735 0 R -/Prev 733 0 R +/Next 736 0 R +/Prev 734 0 R /Dest [98 0 R /XYZ 0 189.36000000000044 null] >> endobj -735 0 obj +736 0 obj << /Title -/Parent 732 0 R +/Parent 733 0 R /Count 0 -/Prev 734 0 R +/Prev 735 0 R /Dest [110 0 R /XYZ 0 792.0 null] >> endobj -736 0 obj +737 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 2 -/First 737 0 R -/Last 738 0 R -/Next 739 0 R -/Prev 732 0 R +/First 738 0 R +/Last 739 0 R +/Next 740 0 R +/Prev 733 0 R /Dest [110 0 R /XYZ 0 702.1200000000001 null] >> endobj -737 0 obj +738 0 obj << /Title -/Parent 736 0 R +/Parent 737 0 R /Count 0 -/Next 738 0 R +/Next 739 0 R /Dest [110 0 R /XYZ 0 662.0400000000002 null] >> endobj -738 0 obj +739 0 obj << /Title -/Parent 736 0 R +/Parent 737 0 R /Count 0 -/Prev 737 0 R +/Prev 738 0 R /Dest [110 0 R /XYZ 0 556.9200000000003 null] >> endobj -739 0 obj +740 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 740 0 R -/Last 742 0 R -/Next 743 0 R -/Prev 736 0 R +/First 741 0 R +/Last 743 0 R +/Next 744 0 R +/Prev 737 0 R /Dest [110 0 R /XYZ 0 500.64000000000044 null] >> endobj -740 0 obj +741 0 obj << /Title -/Parent 739 0 R +/Parent 740 0 R /Count 0 -/Next 741 0 R +/Next 742 0 R /Dest [110 0 R /XYZ 0 460.5600000000004 null] >> endobj -741 0 obj +742 0 obj << /Title -/Parent 739 0 R +/Parent 740 0 R /Count 0 -/Next 742 0 R -/Prev 740 0 R +/Next 743 0 R +/Prev 741 0 R /Dest [110 0 R /XYZ 0 355.44000000000034 null] >> endobj -742 0 obj +743 0 obj << /Title -/Parent 739 0 R +/Parent 740 0 R /Count 0 -/Prev 741 0 R +/Prev 742 0 R /Dest [110 0 R /XYZ 0 250.32000000000028 null] >> endobj -743 0 obj +744 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 744 0 R -/Last 746 0 R -/Next 747 0 R -/Prev 739 0 R +/First 745 0 R +/Last 747 0 R +/Next 748 0 R +/Prev 740 0 R /Dest [110 0 R /XYZ 0 194.04000000000025 null] >> endobj -744 0 obj +745 0 obj << /Title -/Parent 743 0 R +/Parent 744 0 R /Count 0 -/Next 745 0 R +/Next 746 0 R /Dest [110 0 R /XYZ 0 97.80000000000024 null] >> endobj -745 0 obj +746 0 obj << /Title -/Parent 743 0 R +/Parent 744 0 R /Count 0 -/Next 746 0 R -/Prev 744 0 R -/Dest [124 0 R /XYZ 0 645.5999999999999 null] +/Next 747 0 R +/Prev 745 0 R +/Dest [123 0 R /XYZ 0 645.5999999999999 null] >> endobj -746 0 obj +747 0 obj << /Title -/Parent 743 0 R +/Parent 744 0 R /Count 0 -/Prev 745 0 R -/Dest [124 0 R /XYZ 0 540.48 null] +/Prev 746 0 R +/Dest [123 0 R /XYZ 0 540.48 null] >> endobj -747 0 obj +748 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 748 0 R -/Last 750 0 R -/Next 751 0 R -/Prev 743 0 R -/Dest [124 0 R /XYZ 0 484.20000000000016 null] +/First 749 0 R +/Last 751 0 R +/Next 752 0 R +/Prev 744 0 R +/Dest [123 0 R /XYZ 0 484.20000000000016 null] >> endobj -748 0 obj +749 0 obj << /Title -/Parent 747 0 R +/Parent 748 0 R /Count 0 -/Next 749 0 R -/Dest [124 0 R /XYZ 0 387.96000000000015 null] +/Next 750 0 R +/Dest [123 0 R /XYZ 0 387.96000000000015 null] >> endobj -749 0 obj +750 0 obj << /Title -/Parent 747 0 R +/Parent 748 0 R /Count 0 -/Next 750 0 R -/Prev 748 0 R -/Dest [124 0 R /XYZ 0 245.28000000000014 null] +/Next 751 0 R +/Prev 749 0 R +/Dest [123 0 R /XYZ 0 245.28000000000014 null] >> endobj -750 0 obj +751 0 obj << /Title -/Parent 747 0 R +/Parent 748 0 R /Count 0 -/Prev 749 0 R -/Dest [124 0 R /XYZ 0 140.1600000000001 null] +/Prev 750 0 R +/Dest [123 0 R /XYZ 0 140.1600000000001 null] >> endobj -751 0 obj +752 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 752 0 R -/Last 754 0 R -/Next 755 0 R -/Prev 747 0 R +/First 753 0 R +/Last 755 0 R +/Next 756 0 R +/Prev 748 0 R /Dest [134 0 R /XYZ 0 792.0 null] >> endobj -752 0 obj +753 0 obj << /Title -/Parent 751 0 R +/Parent 752 0 R /Count 0 -/Next 753 0 R +/Next 754 0 R /Dest [134 0 R /XYZ 0 662.1600000000001 null] >> endobj -753 0 obj +754 0 obj << /Title -/Parent 751 0 R +/Parent 752 0 R /Count 0 -/Next 754 0 R -/Prev 752 0 R +/Next 755 0 R +/Prev 753 0 R /Dest [134 0 R /XYZ 0 444.3600000000002 null] >> endobj -754 0 obj +755 0 obj << /Title -/Parent 751 0 R +/Parent 752 0 R /Count 0 -/Prev 753 0 R +/Prev 754 0 R /Dest [134 0 R /XYZ 0 339.2400000000001 null] >> endobj -755 0 obj +756 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 756 0 R -/Last 758 0 R -/Next 759 0 R -/Prev 751 0 R +/First 757 0 R +/Last 759 0 R +/Next 760 0 R +/Prev 752 0 R /Dest [134 0 R /XYZ 0 282.9600000000001 null] >> endobj -756 0 obj +757 0 obj << /Title -/Parent 755 0 R +/Parent 756 0 R /Count 0 -/Next 757 0 R +/Next 758 0 R /Dest [134 0 R /XYZ 0 242.8800000000001 null] >> endobj -757 0 obj +758 0 obj << /Title -/Parent 755 0 R +/Parent 756 0 R /Count 0 -/Next 758 0 R -/Prev 756 0 R +/Next 759 0 R +/Prev 757 0 R /Dest [134 0 R /XYZ 0 137.76000000000008 null] >> endobj -758 0 obj +759 0 obj << /Title -/Parent 755 0 R +/Parent 756 0 R /Count 0 -/Prev 757 0 R +/Prev 758 0 R /Dest [144 0 R /XYZ 0 683.1600000000001 null] >> endobj -759 0 obj +760 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 760 0 R -/Last 762 0 R -/Next 763 0 R -/Prev 755 0 R +/First 761 0 R +/Last 763 0 R +/Next 764 0 R +/Prev 756 0 R /Dest [144 0 R /XYZ 0 626.8800000000002 null] >> endobj -760 0 obj +761 0 obj << /Title -/Parent 759 0 R +/Parent 760 0 R /Count 0 -/Next 761 0 R +/Next 762 0 R /Dest [144 0 R /XYZ 0 586.8000000000003 null] >> endobj -761 0 obj +762 0 obj << /Title -/Parent 759 0 R +/Parent 760 0 R /Count 0 -/Next 762 0 R -/Prev 760 0 R +/Next 763 0 R +/Prev 761 0 R /Dest [144 0 R /XYZ 0 481.68000000000046 null] >> endobj -762 0 obj +763 0 obj << /Title -/Parent 759 0 R +/Parent 760 0 R /Count 0 -/Prev 761 0 R +/Prev 762 0 R /Dest [144 0 R /XYZ 0 376.5600000000004 null] >> endobj -763 0 obj +764 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 764 0 R -/Last 766 0 R -/Next 767 0 R -/Prev 759 0 R +/First 765 0 R +/Last 767 0 R +/Next 768 0 R +/Prev 760 0 R /Dest [144 0 R /XYZ 0 320.28000000000037 null] >> endobj -764 0 obj +765 0 obj << /Title -/Parent 763 0 R +/Parent 764 0 R /Count 0 -/Next 765 0 R +/Next 766 0 R /Dest [144 0 R /XYZ 0 280.20000000000033 null] >> endobj -765 0 obj +766 0 obj << /Title -/Parent 763 0 R +/Parent 764 0 R /Count 0 -/Next 766 0 R -/Prev 764 0 R +/Next 767 0 R +/Prev 765 0 R /Dest [144 0 R /XYZ 0 175.08000000000033 null] >> endobj -766 0 obj +767 0 obj << /Title -/Parent 763 0 R +/Parent 764 0 R /Count 0 -/Prev 765 0 R +/Prev 766 0 R /Dest [159 0 R /XYZ 0 792.0 null] >> endobj -767 0 obj +768 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 768 0 R -/Last 770 0 R -/Next 771 0 R -/Prev 763 0 R +/First 769 0 R +/Last 771 0 R +/Next 772 0 R +/Prev 764 0 R /Dest [159 0 R /XYZ 0 702.1200000000001 null] >> endobj -768 0 obj +769 0 obj << /Title -/Parent 767 0 R +/Parent 768 0 R /Count 0 -/Next 769 0 R +/Next 770 0 R /Dest [159 0 R /XYZ 0 662.0400000000002 null] >> endobj -769 0 obj +770 0 obj << /Title -/Parent 767 0 R +/Parent 768 0 R /Count 0 -/Next 770 0 R -/Prev 768 0 R +/Next 771 0 R +/Prev 769 0 R /Dest [159 0 R /XYZ 0 556.9200000000003 null] >> endobj -770 0 obj +771 0 obj << /Title -/Parent 767 0 R +/Parent 768 0 R /Count 0 -/Prev 769 0 R +/Prev 770 0 R /Dest [159 0 R /XYZ 0 451.8000000000004 null] >> endobj -771 0 obj +772 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 4 -/First 772 0 R -/Last 775 0 R -/Next 776 0 R -/Prev 767 0 R +/First 773 0 R +/Last 776 0 R +/Next 777 0 R +/Prev 768 0 R /Dest [159 0 R /XYZ 0 395.5200000000004 null] >> endobj -772 0 obj +773 0 obj << /Title -/Parent 771 0 R +/Parent 772 0 R /Count 0 -/Next 773 0 R +/Next 774 0 R /Dest [159 0 R /XYZ 0 355.44000000000034 null] >> endobj -773 0 obj +774 0 obj << /Title -/Parent 771 0 R +/Parent 772 0 R /Count 0 -/Next 774 0 R -/Prev 772 0 R +/Next 775 0 R +/Prev 773 0 R /Dest [159 0 R /XYZ 0 212.76000000000028 null] >> endobj -774 0 obj +775 0 obj << /Title -/Parent 771 0 R +/Parent 772 0 R /Count 0 -/Next 775 0 R -/Prev 773 0 R +/Next 776 0 R +/Prev 774 0 R /Dest [159 0 R /XYZ 0 107.64000000000024 null] >> endobj -775 0 obj +776 0 obj << /Title -/Parent 771 0 R +/Parent 772 0 R /Count 0 -/Prev 774 0 R +/Prev 775 0 R /Dest [173 0 R /XYZ 0 792.0 null] >> endobj -776 0 obj +777 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 4 -/First 777 0 R -/Last 780 0 R -/Next 781 0 R -/Prev 771 0 R +/First 778 0 R +/Last 781 0 R +/Next 782 0 R +/Prev 772 0 R /Dest [173 0 R /XYZ 0 702.1200000000001 null] >> endobj -777 0 obj +778 0 obj << /Title -/Parent 776 0 R +/Parent 777 0 R /Count 0 -/Next 778 0 R +/Next 779 0 R /Dest [173 0 R /XYZ 0 633.9600000000002 null] >> endobj -778 0 obj +779 0 obj << /Title -/Parent 776 0 R +/Parent 777 0 R /Count 0 -/Next 779 0 R -/Prev 777 0 R +/Next 780 0 R +/Prev 778 0 R /Dest [173 0 R /XYZ 0 491.28000000000026 null] >> endobj -779 0 obj +780 0 obj << /Title -/Parent 776 0 R +/Parent 777 0 R /Count 0 -/Next 780 0 R -/Prev 778 0 R +/Next 781 0 R +/Prev 779 0 R /Dest [173 0 R /XYZ 0 386.1600000000002 null] >> endobj -780 0 obj +781 0 obj << /Title -/Parent 776 0 R +/Parent 777 0 R /Count 0 -/Prev 779 0 R +/Prev 780 0 R /Dest [173 0 R /XYZ 0 329.88000000000017 null] >> endobj -781 0 obj +782 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 4 -/First 782 0 R -/Last 785 0 R -/Next 786 0 R -/Prev 776 0 R +/First 783 0 R +/Last 786 0 R +/Next 787 0 R +/Prev 777 0 R /Dest [173 0 R /XYZ 0 273.60000000000014 null] >> endobj -782 0 obj -<< /Title -/Parent 781 0 R -/Count 0 -/Next 783 0 R -/Dest [173 0 R /XYZ 0 205.44000000000014 null] ->> -endobj 783 0 obj -<< /Title -/Parent 781 0 R +<< /Title +/Parent 782 0 R /Count 0 /Next 784 0 R -/Prev 782 0 R -/Dest [187 0 R /XYZ 0 792.0 null] +/Dest [173 0 R /XYZ 0 205.44000000000014 null] >> endobj 784 0 obj -<< /Title -/Parent 781 0 R +<< /Title +/Parent 782 0 R /Count 0 /Next 785 0 R /Prev 783 0 R -/Dest [187 0 R /XYZ 0 653.2800000000002 null] +/Dest [186 0 R /XYZ 0 792.0 null] >> endobj 785 0 obj -<< /Title -/Parent 781 0 R +<< /Title +/Parent 782 0 R /Count 0 +/Next 786 0 R /Prev 784 0 R -/Dest [187 0 R /XYZ 0 597.0000000000003 null] +/Dest [186 0 R /XYZ 0 653.2800000000002 null] >> endobj 786 0 obj -<< /Title -/Parent 682 0 R -/Count 3 -/First 787 0 R -/Last 789 0 R -/Next 790 0 R -/Prev 781 0 R -/Dest [187 0 R /XYZ 0 540.7200000000005 null] +<< /Title +/Parent 782 0 R +/Count 0 +/Prev 785 0 R +/Dest [186 0 R /XYZ 0 597.0000000000003 null] >> endobj 787 0 obj -<< /Title -/Parent 786 0 R -/Count 0 -/Next 788 0 R -/Dest [187 0 R /XYZ 0 500.6400000000005 null] +<< /Title +/Parent 683 0 R +/Count 3 +/First 788 0 R +/Last 790 0 R +/Next 791 0 R +/Prev 782 0 R +/Dest [186 0 R /XYZ 0 540.7200000000005 null] >> endobj 788 0 obj -<< /Title -/Parent 786 0 R +<< /Title +/Parent 787 0 R /Count 0 /Next 789 0 R -/Prev 787 0 R -/Dest [187 0 R /XYZ 0 395.5200000000005 null] +/Dest [186 0 R /XYZ 0 500.6400000000005 null] >> endobj 789 0 obj -<< /Title -/Parent 786 0 R +<< /Title +/Parent 787 0 R /Count 0 +/Next 790 0 R /Prev 788 0 R -/Dest [187 0 R /XYZ 0 290.40000000000043 null] +/Dest [186 0 R /XYZ 0 395.5200000000005 null] >> endobj 790 0 obj -<< /Title -/Parent 682 0 R -/Count 4 -/First 791 0 R -/Last 794 0 R -/Next 795 0 R -/Prev 786 0 R -/Dest [187 0 R /XYZ 0 234.1200000000004 null] +<< /Title +/Parent 787 0 R +/Count 0 +/Prev 789 0 R +/Dest [186 0 R /XYZ 0 290.40000000000043 null] >> endobj 791 0 obj -<< /Title -/Parent 790 0 R -/Count 0 -/Next 792 0 R -/Dest [187 0 R /XYZ 0 194.0400000000004 null] +<< /Title +/Parent 683 0 R +/Count 4 +/First 792 0 R +/Last 795 0 R +/Next 796 0 R +/Prev 787 0 R +/Dest [186 0 R /XYZ 0 234.1200000000004 null] >> endobj 792 0 obj -<< /Title -/Parent 790 0 R +<< /Title +/Parent 791 0 R /Count 0 /Next 793 0 R -/Prev 791 0 R -/Dest [201 0 R /XYZ 0 792.0 null] +/Dest [186 0 R /XYZ 0 194.0400000000004 null] >> endobj 793 0 obj -<< /Title -/Parent 790 0 R +<< /Title +/Parent 791 0 R /Count 0 /Next 794 0 R /Prev 792 0 R -/Dest [201 0 R /XYZ 0 653.2800000000002 null] +/Dest [199 0 R /XYZ 0 792.0 null] >> endobj 794 0 obj -<< /Title -/Parent 790 0 R +<< /Title +/Parent 791 0 R /Count 0 +/Next 795 0 R /Prev 793 0 R -/Dest [201 0 R /XYZ 0 597.0000000000003 null] +/Dest [199 0 R /XYZ 0 653.2800000000002 null] >> endobj 795 0 obj +<< /Title +/Parent 791 0 R +/Count 0 +/Prev 794 0 R +/Dest [199 0 R /XYZ 0 597.0000000000003 null] +>> +endobj +796 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 2 -/First 796 0 R -/Last 797 0 R -/Next 798 0 R -/Prev 790 0 R -/Dest [201 0 R /XYZ 0 540.7200000000005 null] +/First 797 0 R +/Last 798 0 R +/Next 799 0 R +/Prev 791 0 R +/Dest [199 0 R /XYZ 0 540.7200000000005 null] >> endobj -796 0 obj +797 0 obj << /Title -/Parent 795 0 R +/Parent 796 0 R /Count 0 -/Next 797 0 R -/Dest [201 0 R /XYZ 0 500.6400000000005 null] +/Next 798 0 R +/Dest [199 0 R /XYZ 0 500.6400000000005 null] >> endobj -797 0 obj +798 0 obj << /Title -/Parent 795 0 R +/Parent 796 0 R /Count 0 -/Prev 796 0 R -/Dest [201 0 R /XYZ 0 395.52000000000044 null] +/Prev 797 0 R +/Dest [199 0 R /XYZ 0 395.52000000000044 null] >> endobj -798 0 obj +799 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 799 0 R -/Last 801 0 R -/Next 802 0 R -/Prev 795 0 R -/Dest [201 0 R /XYZ 0 339.2400000000004 null] +/First 800 0 R +/Last 802 0 R +/Next 803 0 R +/Prev 796 0 R +/Dest [199 0 R /XYZ 0 339.2400000000004 null] >> endobj -799 0 obj +800 0 obj << /Title -/Parent 798 0 R +/Parent 799 0 R /Count 0 -/Next 800 0 R -/Dest [201 0 R /XYZ 0 243.00000000000043 null] +/Next 801 0 R +/Dest [199 0 R /XYZ 0 243.00000000000043 null] >> endobj -800 0 obj +801 0 obj << /Title -/Parent 798 0 R +/Parent 799 0 R /Count 0 -/Next 801 0 R -/Prev 799 0 R -/Dest [201 0 R /XYZ 0 100.32000000000039 null] +/Next 802 0 R +/Prev 800 0 R +/Dest [199 0 R /XYZ 0 100.32000000000039 null] >> endobj -801 0 obj +802 0 obj << /Title -/Parent 798 0 R +/Parent 799 0 R /Count 0 -/Prev 800 0 R +/Prev 801 0 R /Dest [214 0 R /XYZ 0 683.1600000000001 null] >> endobj -802 0 obj +803 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 803 0 R -/Last 805 0 R -/Next 806 0 R -/Prev 798 0 R +/First 804 0 R +/Last 806 0 R +/Next 807 0 R +/Prev 799 0 R /Dest [214 0 R /XYZ 0 626.8800000000002 null] >> endobj -803 0 obj +804 0 obj << /Title -/Parent 802 0 R +/Parent 803 0 R /Count 0 -/Next 804 0 R +/Next 805 0 R /Dest [214 0 R /XYZ 0 530.6400000000003 null] >> endobj -804 0 obj +805 0 obj << /Title -/Parent 802 0 R +/Parent 803 0 R /Count 0 -/Next 805 0 R -/Prev 803 0 R +/Next 806 0 R +/Prev 804 0 R /Dest [214 0 R /XYZ 0 387.9600000000003 null] >> endobj -805 0 obj +806 0 obj << /Title -/Parent 802 0 R +/Parent 803 0 R /Count 0 -/Prev 804 0 R +/Prev 805 0 R /Dest [214 0 R /XYZ 0 282.84000000000026 null] >> endobj -806 0 obj +807 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 4 -/First 807 0 R -/Last 810 0 R -/Next 811 0 R -/Prev 802 0 R +/First 808 0 R +/Last 811 0 R +/Next 812 0 R +/Prev 803 0 R /Dest [214 0 R /XYZ 0 226.56000000000026 null] >> endobj -807 0 obj +808 0 obj << /Title -/Parent 806 0 R +/Parent 807 0 R /Count 0 -/Next 808 0 R +/Next 809 0 R /Dest [214 0 R /XYZ 0 130.32000000000025 null] >> endobj -808 0 obj +809 0 obj << /Title -/Parent 806 0 R +/Parent 807 0 R /Count 0 -/Next 809 0 R -/Prev 807 0 R +/Next 810 0 R +/Prev 808 0 R /Dest [225 0 R /XYZ 0 608.04 null] >> endobj -809 0 obj +810 0 obj << /Title -/Parent 806 0 R +/Parent 807 0 R /Count 0 -/Next 810 0 R -/Prev 808 0 R +/Next 811 0 R +/Prev 809 0 R /Dest [225 0 R /XYZ 0 502.9200000000001 null] >> endobj -810 0 obj +811 0 obj << /Title -/Parent 806 0 R +/Parent 807 0 R /Count 0 -/Prev 809 0 R +/Prev 810 0 R /Dest [225 0 R /XYZ 0 446.64000000000004 null] >> endobj -811 0 obj +812 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 2 -/First 812 0 R -/Last 813 0 R -/Next 814 0 R -/Prev 806 0 R +/First 813 0 R +/Last 814 0 R +/Next 815 0 R +/Prev 807 0 R /Dest [225 0 R /XYZ 0 390.36 null] >> endobj -812 0 obj +813 0 obj << /Title -/Parent 811 0 R +/Parent 812 0 R /Count 0 -/Next 813 0 R +/Next 814 0 R /Dest [225 0 R /XYZ 0 350.28 null] >> endobj -813 0 obj +814 0 obj << /Title -/Parent 811 0 R +/Parent 812 0 R /Count 0 -/Prev 812 0 R +/Prev 813 0 R /Dest [225 0 R /XYZ 0 245.15999999999997 null] >> endobj -814 0 obj +815 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 2 -/First 815 0 R -/Last 816 0 R -/Next 817 0 R -/Prev 811 0 R +/First 816 0 R +/Last 817 0 R +/Next 818 0 R +/Prev 812 0 R /Dest [225 0 R /XYZ 0 188.87999999999994 null] >> endobj -815 0 obj +816 0 obj << /Title -/Parent 814 0 R +/Parent 815 0 R /Count 0 -/Next 816 0 R +/Next 817 0 R /Dest [225 0 R /XYZ 0 148.79999999999993 null] >> endobj -816 0 obj +817 0 obj << /Title -/Parent 814 0 R +/Parent 815 0 R /Count 0 -/Prev 815 0 R -/Dest [237 0 R /XYZ 0 792.0 null] +/Prev 816 0 R +/Dest [238 0 R /XYZ 0 792.0 null] >> endobj -817 0 obj +818 0 obj << /Title -/Parent 682 0 R +/Parent 683 0 R /Count 3 -/First 818 0 R -/Last 820 0 R -/Prev 814 0 R -/Dest [237 0 R /XYZ 0 702.1200000000001 null] ->> -endobj -818 0 obj -<< /Title -/Parent 817 0 R -/Count 0 -/Next 819 0 R -/Dest [237 0 R /XYZ 0 662.0400000000002 null] +/First 819 0 R +/Last 821 0 R +/Prev 815 0 R +/Dest [238 0 R /XYZ 0 702.1200000000001 null] >> endobj 819 0 obj -<< /Title -/Parent 817 0 R +<< /Title +/Parent 818 0 R /Count 0 /Next 820 0 R -/Prev 818 0 R -/Dest [237 0 R /XYZ 0 556.9200000000003 null] +/Dest [238 0 R /XYZ 0 662.0400000000002 null] >> endobj 820 0 obj -<< /Title -/Parent 817 0 R +<< /Title +/Parent 818 0 R /Count 0 +/Next 821 0 R /Prev 819 0 R -/Dest [237 0 R /XYZ 0 451.8000000000004 null] +/Dest [238 0 R /XYZ 0 556.9200000000003 null] >> endobj 821 0 obj -<< /Title -/Parent 676 0 R -/Count 20 -/First 822 0 R -/Last 841 0 R -/Prev 682 0 R -/Dest [246 0 R /XYZ 0 792.0 null] +<< /Title +/Parent 818 0 R +/Count 0 +/Prev 820 0 R +/Dest [238 0 R /XYZ 0 451.8000000000004 null] >> endobj 822 0 obj -<< /Title -/Parent 821 0 R -/Count 0 -/Next 823 0 R -/Dest [246 0 R /XYZ 0 712.0799999999999 null] +<< /Title +/Parent 677 0 R +/Count 20 +/First 823 0 R +/Last 842 0 R +/Prev 683 0 R +/Dest [247 0 R /XYZ 0 792.0 null] >> endobj 823 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 824 0 R -/Prev 822 0 R -/Dest [246 0 R /XYZ 0 524.04 null] +/Dest [247 0 R /XYZ 0 712.0799999999999 null] >> endobj 824 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 825 0 R /Prev 823 0 R -/Dest [246 0 R /XYZ 0 335.99999999999994 null] +/Dest [247 0 R /XYZ 0 524.04 null] >> endobj 825 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 826 0 R /Prev 824 0 R -/Dest [253 0 R /XYZ 0 608.04 null] +/Dest [247 0 R /XYZ 0 335.99999999999994 null] >> endobj 826 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 827 0 R /Prev 825 0 R -/Dest [253 0 R /XYZ 0 157.07999999999998 null] +/Dest [254 0 R /XYZ 0 608.04 null] >> endobj 827 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 828 0 R /Prev 826 0 R -/Dest [259 0 R /XYZ 0 683.1600000000001 null] +/Dest [254 0 R /XYZ 0 157.07999999999998 null] >> endobj 828 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 829 0 R /Prev 827 0 R -/Dest [259 0 R /XYZ 0 495.1200000000002 null] +/Dest [260 0 R /XYZ 0 683.1600000000001 null] >> endobj 829 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 830 0 R /Prev 828 0 R -/Dest [266 0 R /XYZ 0 345.1200000000003 null] +/Dest [260 0 R /XYZ 0 495.1200000000002 null] >> endobj 830 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 831 0 R /Prev 829 0 R -/Dest [272 0 R /XYZ 0 194.88000000000017 null] +/Dest [267 0 R /XYZ 0 345.1200000000003 null] >> endobj 831 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 832 0 R /Prev 830 0 R -/Dest [287 0 R /XYZ 0 792.0 null] +/Dest [273 0 R /XYZ 0 194.88000000000017 null] >> endobj 832 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 833 0 R /Prev 831 0 R -/Dest [295 0 R /XYZ 0 495.3600000000003 null] +/Dest [288 0 R /XYZ 0 792.0 null] >> endobj 833 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 834 0 R /Prev 832 0 R -/Dest [303 0 R /XYZ 0 532.9200000000001 null] +/Dest [296 0 R /XYZ 0 495.3600000000003 null] >> endobj 834 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 835 0 R /Prev 833 0 R -/Dest [310 0 R /XYZ 0 792.0 null] +/Dest [304 0 R /XYZ 0 532.9200000000001 null] >> endobj 835 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 836 0 R /Prev 834 0 R -/Dest [310 0 R /XYZ 0 457.68 null] +/Dest [311 0 R /XYZ 0 792.0 null] >> endobj 836 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 837 0 R /Prev 835 0 R -/Dest [317 0 R /XYZ 0 608.0400000000002 null] +/Dest [311 0 R /XYZ 0 457.68 null] >> endobj 837 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 838 0 R /Prev 836 0 R -/Dest [317 0 R /XYZ 0 420.0000000000003 null] +/Dest [318 0 R /XYZ 0 608.0400000000002 null] >> endobj 838 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 839 0 R /Prev 837 0 R -/Dest [325 0 R /XYZ 0 307.5600000000001 null] +/Dest [318 0 R /XYZ 0 420.0000000000003 null] >> endobj 839 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 840 0 R /Prev 838 0 R -/Dest [325 0 R /XYZ 0 239.70000000000007 null] +/Dest [326 0 R /XYZ 0 345.12000000000006 null] >> endobj 840 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 /Next 841 0 R /Prev 839 0 R -/Dest [334 0 R /XYZ 0 345.12 null] +/Dest [326 0 R /XYZ 0 277.26 null] >> endobj 841 0 obj -<< /Title -/Parent 821 0 R +<< /Title +/Parent 822 0 R /Count 0 +/Next 842 0 R /Prev 840 0 R -/Dest [342 0 R /XYZ 0 570.48 null] +/Dest [336 0 R /XYZ 0 420.23999999999995 null] >> endobj 842 0 obj +<< /Title +/Parent 822 0 R +/Count 0 +/Prev 841 0 R +/Dest [343 0 R /XYZ 0 645.5999999999999 null] +>> +endobj +843 0 obj << /Nums [0 << /P (i) >> 1 << /P (ii) >> 2 << /P (iii) @@ -55195,7 +55020,7 @@ endobj >>] >> endobj -843 0 obj +844 0 obj << /Length1 12332 /Length 7916 /Filter [/FlateDecode] @@ -55232,10 +55057,10 @@ MR ”.ìñÿZ†bh endstream endobj -844 0 obj +845 0 obj << /Type /FontDescriptor /FontName /AAAAAA+NotoSerif -/FontFile2 843 0 R +/FontFile2 844 0 R /FontBBox [-212 -250 1246 1047] /Flags 6 /StemV 0 @@ -55246,7 +55071,7 @@ endobj /XHeight 1098 >> endobj -845 0 obj +846 0 obj << /Length 1286 /Filter [/FlateDecode] >> @@ -55256,10 +55081,10 @@ x ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡+Þ!Êw¹âB®x‡b®x‡+ÞïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆx‹ oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ– -ã­Œ‹·é€"¯åþR¦W*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x ¥úëÈVæz·ÌþÊ[YEãV¼Y³ÕÙ_}/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>MU¡Û\ØjPSã {HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî; ¥2^ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…> ¼M†ÁBi2 .Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~êñZ?¾=¶×/·ÛöÄίÕõ~:÷o?$®—«ÎÒÿ¿ç†óO endstream endobj -846 0 obj +847 0 obj [259 1000 1000 1000 1000 1000 1000 1000 346 346 1000 1000 250 310 250 288 559 559 559 559 559 559 559 559 559 559 286 1000 559 559 559 500 1000 705 653 613 727 623 589 713 792 367 356 1000 623 937 763 742 604 1000 655 543 612 716 674 1046 1000 625 1000 1000 1000 1000 1000 458 1000 562 613 492 613 535 369 538 634 319 299 584 310 944 645 577 613 1000 471 451 352 634 579 861 578 564 1000 428 1000 428 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 361 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000] endobj -847 0 obj +848 0 obj << /Length1 11528 /Length 7660 /Filter [/FlateDecode] @@ -55301,10 +55126,10 @@ g òza\ìnå; ¬vd'ãÈËæØË"°MLÙ#13ö†ÚòʦöJ+ƒâîóí]&Õœ§A§vÐêré3@iÇ+‡ÜÑk®–,+fXL¹Èº)¥è¿!²áíòµ§¥‹gȹH0Ãg"41ý?Š›’û endstream endobj -848 0 obj +849 0 obj << /Type /FontDescriptor /FontName /AAAAAB+NotoSerif-Bold -/FontFile2 847 0 R +/FontFile2 848 0 R /FontBBox [-212 -250 1306 1058] /Flags 6 /StemV 0 @@ -55315,7 +55140,7 @@ endobj /XHeight 1098 >> endobj -849 0 obj +850 0 obj << /Length 1286 /Filter [/FlateDecode] >> @@ -55325,10 +55150,10 @@ x ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡+Þ!Êw¹âB®x‡b®x‡+ÞïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆx‹ oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ– -ã­Œ‹·é€"¯åþR¦W*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x ¥úëÈVæz·ÌþÊ[YEãV¼Y³ÕÙ_}/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>MU¡Û\ØjPSã {HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî; ¥2^ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…> ¼M†ÁBi2 .Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~êñZ?¾=¶×/·ÛöÄίÕõ~:÷o?$®—«ÎÒÿ¿ç†óO endstream endobj -850 0 obj +851 0 obj [259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 293 288 559 559 559 559 559 559 559 559 559 559 1000 1000 1000 559 1000 549 1000 752 671 667 767 652 621 769 818 400 368 1000 653 952 788 787 638 1000 707 585 652 747 698 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 599 648 526 648 570 407 560 666 352 345 636 352 985 666 612 645 647 522 487 404 666 605 855 645 579 1000 441 1000 441 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000] endobj -851 0 obj +852 0 obj << /Length1 5116 /Length 3170 /Filter [/FlateDecode] @@ -55348,10 +55173,10 @@ a ÿ:´2õ]Û^Ô5 w,¥Âº*›Ó‹Œ58«mÖg·±nkÞÄ7cÙÞB4èÆa¯ÅÊD[NaéU‹> endobj -853 0 obj +854 0 obj << /Length 1286 /Filter [/FlateDecode] >> @@ -55372,10 +55197,10 @@ x ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡+Þ!Êw¹âB®x‡b®x‡+ÞïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆx‹ oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ– -ã­Œ‹·é€"¯åþR¦W*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x ¥úëÈVæz·ÌþÊ[YEãV¼Y³ÕÙ_}/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>MU¡Û\ØjPSã {HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî; ¥2^ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…> ¼M†ÁBi2 .Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~êñZ?¾=¶×/·ÛöÄίÕõ~:÷o?$®—«ÎÒÿ¿ç†óO endstream endobj -854 0 obj +855 0 obj [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 653 1000 1000 1000 1000 1000 792 1000 1000 1000 1000 1000 1000 1000 620 1000 1000 543 612 1000 674 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 579 1000 486 579 493 1000 1000 599 304 1000 1000 304 895 599 574 577 560 467 463 368 599 1000 1000 1000 527 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000] endobj -855 0 obj +856 0 obj << /Length1 3188 /Length 2052 /Filter [/FlateDecode] @@ -55393,10 +55218,10 @@ f hžàdcßüSã¯wâ_Mõ endstream endobj -856 0 obj +857 0 obj << /Type /FontDescriptor /FontName /AAAAAD+mplus1mn-regular -/FontFile2 855 0 R +/FontFile2 856 0 R /FontBBox [0 -230 1000 860] /Flags 4 /StemV 0 @@ -55407,7 +55232,7 @@ endobj /XHeight 0 >> endobj -857 0 obj +858 0 obj << /Length 1286 /Filter [/FlateDecode] >> @@ -55417,11 +55242,11 @@ x ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡+Þ!Êw¹âB®x‡b®x‡+ÞïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆx‹ oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ– -ã­Œ‹·é€"¯åþR¦W*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x ¥úëÈVæz·ÌþÊ[YEãV¼Y³ÕÙ_}/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>MU¡Û\ØjPSã {HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî; ¥2^ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…> ¼M†ÁBi2 .Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~êñZ?¾=¶×/·ÛöÄίÕõ~:÷o?$®—«ÎÒÿ¿ç†óO endstream endobj -858 0 obj +859 0 obj [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 500 1000 500 1000 1000 1000 500 500 1000 500 1000 500 500 500 1000 1000 500 500 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000] endobj xref -0 859 +0 860 0000000000 65535 f 0000000015 00000 n 0000000264 00000 n @@ -55442,850 +55267,851 @@ xref 0000130796 00000 n 0000143652 00000 n 0000144082 00000 n -0000146514 00000 n -0000146751 00000 n -0000146794 00000 n -0000146843 00000 n -0000146973 00000 n -0000147146 00000 n -0000147201 00000 n -0000147376 00000 n -0000147420 00000 n -0000159625 00000 n -0000159886 00000 n -0000159929 00000 n -0000159984 00000 n -0000160027 00000 n -0000160199 00000 n -0000160254 00000 n -0000160429 00000 n -0000160485 00000 n -0000160540 00000 n -0000160595 00000 n -0000160651 00000 n -0000160706 00000 n -0000160871 00000 n -0000160926 00000 n -0000160982 00000 n -0000177457 00000 n -0000177738 00000 n -0000177781 00000 n -0000177937 00000 n -0000177992 00000 n -0000178047 00000 n -0000178102 00000 n -0000178257 00000 n -0000178312 00000 n -0000178470 00000 n -0000178525 00000 n -0000178580 00000 n -0000178882 00000 n -0000179192 00000 n -0000179248 00000 n -0000179304 00000 n -0000197589 00000 n -0000197870 00000 n -0000197913 00000 n -0000197968 00000 n -0000198023 00000 n -0000198078 00000 n -0000198235 00000 n -0000198290 00000 n -0000198345 00000 n -0000198401 00000 n -0000198557 00000 n -0000198613 00000 n -0000198771 00000 n -0000198827 00000 n -0000214555 00000 n -0000214805 00000 n -0000214848 00000 n -0000214903 00000 n -0000214958 00000 n -0000215013 00000 n -0000215068 00000 n -0000215124 00000 n -0000215180 00000 n -0000215235 00000 n -0000215712 00000 n -0000215768 00000 n -0000231871 00000 n -0000232138 00000 n -0000232181 00000 n -0000232236 00000 n -0000232554 00000 n -0000232610 00000 n -0000232771 00000 n -0000232826 00000 n -0000232882 00000 n -0000232938 00000 n -0000232994 00000 n -0000250890 00000 n -0000251165 00000 n -0000251316 00000 n -0000251372 00000 n -0000251428 00000 n -0000251484 00000 n -0000251540 00000 n -0000251596 00000 n -0000251652 00000 n -0000251708 00000 n -0000251765 00000 n -0000251927 00000 n -0000265584 00000 n -0000265854 00000 n -0000265899 00000 n -0000265956 00000 n -0000266013 00000 n -0000266070 00000 n -0000266128 00000 n -0000266425 00000 n -0000266482 00000 n -0000266540 00000 n -0000266702 00000 n -0000266760 00000 n -0000266818 00000 n -0000266875 00000 n -0000286022 00000 n -0000286300 00000 n -0000286357 00000 n -0000286499 00000 n -0000286545 00000 n -0000286603 00000 n -0000286661 00000 n -0000286719 00000 n -0000286883 00000 n -0000286940 00000 n -0000304246 00000 n -0000304516 00000 n -0000304561 00000 n -0000304618 00000 n -0000304675 00000 n -0000304839 00000 n -0000304896 00000 n -0000304953 00000 n -0000305010 00000 n -0000305068 00000 n -0000324196 00000 n -0000324482 00000 n -0000324634 00000 n -0000324691 00000 n -0000324748 00000 n -0000324805 00000 n -0000324863 00000 n -0000325026 00000 n -0000325083 00000 n -0000325383 00000 n -0000325441 00000 n -0000325499 00000 n -0000325823 00000 n -0000325881 00000 n -0000326044 00000 n -0000344394 00000 n -0000344680 00000 n -0000344725 00000 n -0000344782 00000 n -0000344839 00000 n -0000344896 00000 n -0000345059 00000 n -0000345116 00000 n -0000345173 00000 n -0000345231 00000 n -0000345388 00000 n -0000345446 00000 n -0000345610 00000 n -0000345668 00000 n -0000362759 00000 n -0000363045 00000 n -0000363090 00000 n -0000363147 00000 n -0000363204 00000 n -0000363367 00000 n -0000363425 00000 n -0000363602 00000 n -0000363659 00000 n -0000363717 00000 n -0000363775 00000 n -0000364058 00000 n -0000364116 00000 n -0000364273 00000 n -0000380607 00000 n -0000380885 00000 n -0000380930 00000 n -0000381474 00000 n -0000381636 00000 n -0000381693 00000 n -0000381750 00000 n -0000381807 00000 n -0000381864 00000 n -0000381921 00000 n -0000382084 00000 n -0000382142 00000 n -0000382199 00000 n -0000382256 00000 n -0000397495 00000 n -0000397773 00000 n -0000397818 00000 n -0000397977 00000 n -0000398034 00000 n -0000398091 00000 n -0000398148 00000 n -0000398205 00000 n -0000398365 00000 n -0000398423 00000 n -0000398480 00000 n -0000398538 00000 n -0000398596 00000 n -0000413344 00000 n -0000413614 00000 n -0000413671 00000 n -0000413728 00000 n -0000413785 00000 n -0000413842 00000 n -0000414001 00000 n -0000414059 00000 n -0000414457 00000 n -0000414515 00000 n -0000414573 00000 n -0000433834 00000 n -0000434112 00000 n -0000434158 00000 n -0000434307 00000 n -0000434364 00000 n -0000434422 00000 n -0000434468 00000 n -0000434514 00000 n -0000434685 00000 n -0000434743 00000 n -0000434801 00000 n -0000434859 00000 n -0000443511 00000 n -0000443781 00000 n -0000443826 00000 n -0000443883 00000 n -0000443940 00000 n -0000444262 00000 n -0000444319 00000 n -0000444490 00000 n -0000444547 00000 n -0000461747 00000 n -0000462004 00000 n -0000462049 00000 n -0000462106 00000 n -0000462152 00000 n -0000462210 00000 n -0000462388 00000 n -0000482294 00000 n -0000482551 00000 n -0000482597 00000 n -0000482751 00000 n -0000482809 00000 n -0000483115 00000 n -0000503663 00000 n -0000503936 00000 n -0000504097 00000 n -0000504154 00000 n -0000504211 00000 n -0000504381 00000 n -0000504548 00000 n -0000525951 00000 n -0000526224 00000 n -0000526373 00000 n -0000526544 00000 n -0000526703 00000 n -0000526760 00000 n -0000548591 00000 n -0000548880 00000 n -0000549048 00000 n -0000549195 00000 n -0000549344 00000 n -0000549495 00000 n -0000549655 00000 n -0000549713 00000 n -0000572673 00000 n -0000572962 00000 n -0000573131 00000 n -0000573299 00000 n -0000573469 00000 n -0000573641 00000 n -0000573801 00000 n -0000595450 00000 n -0000595739 00000 n -0000595784 00000 n -0000595943 00000 n -0000596101 00000 n -0000596261 00000 n -0000596412 00000 n -0000596562 00000 n -0000619360 00000 n -0000619649 00000 n -0000619706 00000 n -0000619876 00000 n -0000620047 00000 n -0000620214 00000 n -0000620386 00000 n -0000620561 00000 n -0000642834 00000 n -0000643115 00000 n -0000643255 00000 n -0000643431 00000 n -0000643488 00000 n -0000643657 00000 n -0000643844 00000 n -0000664517 00000 n -0000664790 00000 n -0000664835 00000 n -0000664998 00000 n -0000665044 00000 n -0000665233 00000 n -0000665395 00000 n -0000686061 00000 n -0000686334 00000 n -0000686391 00000 n -0000686823 00000 n -0000686999 00000 n -0000687171 00000 n -0000687228 00000 n -0000687397 00000 n -0000707619 00000 n -0000707908 00000 n -0000708057 00000 n -0000708232 00000 n -0000708397 00000 n -0000708560 00000 n -0000708617 00000 n -0000708675 00000 n -0000708845 00000 n -0000730450 00000 n -0000730739 00000 n -0000730888 00000 n -0000731031 00000 n -0000731206 00000 n -0000731350 00000 n -0000731396 00000 n -0000731565 00000 n -0000745129 00000 n -0000745402 00000 n -0000745577 00000 n -0000745623 00000 n -0000745783 00000 n -0000745952 00000 n -0000746096 00000 n -0000746241 00000 n -0000746406 00000 n -0000746562 00000 n -0000746720 00000 n -0000746867 00000 n -0000747029 00000 n -0000747171 00000 n -0000747337 00000 n -0000747482 00000 n -0000747639 00000 n -0000747785 00000 n -0000747941 00000 n -0000748086 00000 n -0000748242 00000 n -0000748387 00000 n -0000748546 00000 n -0000748694 00000 n -0000748852 00000 n -0000748999 00000 n -0000749166 00000 n -0000749312 00000 n -0000749472 00000 n -0000749621 00000 n -0000749779 00000 n -0000749926 00000 n -0000750082 00000 n -0000750228 00000 n -0000750388 00000 n -0000750537 00000 n -0000750697 00000 n -0000750846 00000 n -0000751002 00000 n -0000751148 00000 n -0000751316 00000 n -0000751463 00000 n -0000751622 00000 n -0000751770 00000 n -0000751926 00000 n -0000752072 00000 n -0000752232 00000 n -0000752381 00000 n -0000752548 00000 n -0000752694 00000 n -0000752854 00000 n -0000753003 00000 n -0000753161 00000 n -0000753308 00000 n -0000753476 00000 n -0000753623 00000 n -0000753795 00000 n -0000753946 00000 n -0000754105 00000 n -0000754253 00000 n -0000754411 00000 n -0000754558 00000 n -0000754713 00000 n -0000754858 00000 n -0000755030 00000 n -0000755181 00000 n -0000755342 00000 n -0000755492 00000 n -0000755651 00000 n -0000755800 00000 n -0000755960 00000 n -0000756109 00000 n -0000756276 00000 n -0000756422 00000 n -0000756592 00000 n -0000756741 00000 n -0000756900 00000 n -0000757048 00000 n -0000757194 00000 n -0000757329 00000 n -0000757484 00000 n -0000757618 00000 n -0000757777 00000 n -0000757915 00000 n -0000758063 00000 n -0000758201 00000 n -0000758370 00000 n -0000758518 00000 n -0000758683 00000 n -0000758828 00000 n -0000758998 00000 n -0000759147 00000 n -0000759306 00000 n -0000759455 00000 n -0000759624 00000 n -0000759772 00000 n -0000759936 00000 n -0000760081 00000 n -0000760251 00000 n -0000760400 00000 n -0000760559 00000 n -0000760708 00000 n -0000760866 00000 n -0000761013 00000 n -0000761182 00000 n -0000761330 00000 n -0000761497 00000 n -0000761643 00000 n -0000761814 00000 n -0000761964 00000 n -0000762124 00000 n -0000762274 00000 n -0000762438 00000 n -0000762583 00000 n -0000762753 00000 n -0000762902 00000 n -0000763062 00000 n -0000763212 00000 n -0000763383 00000 n -0000763533 00000 n -0000763690 00000 n -0000763836 00000 n -0000763995 00000 n -0000764144 00000 n -0000764313 00000 n -0000764461 00000 n -0000764617 00000 n -0000764763 00000 n -0000764935 00000 n -0000765086 00000 n -0000765246 00000 n -0000765396 00000 n -0000765565 00000 n -0000765713 00000 n -0000765880 00000 n -0000766027 00000 n -0000766200 00000 n -0000766352 00000 n -0000766513 00000 n -0000766664 00000 n -0000766835 00000 n -0000766985 00000 n -0000767152 00000 n -0000767299 00000 n -0000767472 00000 n -0000767624 00000 n -0000767785 00000 n -0000767936 00000 n -0000768106 00000 n -0000768255 00000 n -0000768419 00000 n -0000768581 00000 n -0000768722 00000 n -0000768864 00000 n -0000769024 00000 n +0000146512 00000 n +0000146749 00000 n +0000146792 00000 n +0000146841 00000 n +0000146979 00000 n +0000147152 00000 n +0000147207 00000 n +0000147382 00000 n +0000147426 00000 n +0000159631 00000 n +0000159892 00000 n +0000159935 00000 n +0000159990 00000 n +0000160033 00000 n +0000160205 00000 n +0000160260 00000 n +0000160435 00000 n +0000160491 00000 n +0000160546 00000 n +0000160601 00000 n +0000160657 00000 n +0000160712 00000 n +0000160877 00000 n +0000160932 00000 n +0000160988 00000 n +0000177463 00000 n +0000177744 00000 n +0000177787 00000 n +0000177943 00000 n +0000177998 00000 n +0000178053 00000 n +0000178108 00000 n +0000178263 00000 n +0000178318 00000 n +0000178476 00000 n +0000178531 00000 n +0000178586 00000 n +0000178888 00000 n +0000179198 00000 n +0000179254 00000 n +0000179310 00000 n +0000197595 00000 n +0000197876 00000 n +0000197919 00000 n +0000197974 00000 n +0000198029 00000 n +0000198084 00000 n +0000198241 00000 n +0000198296 00000 n +0000198351 00000 n +0000198407 00000 n +0000198563 00000 n +0000198619 00000 n +0000198777 00000 n +0000198833 00000 n +0000214561 00000 n +0000214811 00000 n +0000214854 00000 n +0000214909 00000 n +0000214964 00000 n +0000215019 00000 n +0000215074 00000 n +0000215130 00000 n +0000215186 00000 n +0000215241 00000 n +0000215522 00000 n +0000215578 00000 n +0000231681 00000 n +0000231948 00000 n +0000231991 00000 n +0000232046 00000 n +0000232364 00000 n +0000232420 00000 n +0000232581 00000 n +0000232636 00000 n +0000232692 00000 n +0000232748 00000 n +0000232804 00000 n +0000250700 00000 n +0000250975 00000 n +0000251126 00000 n +0000251182 00000 n +0000251238 00000 n +0000251294 00000 n +0000251350 00000 n +0000251406 00000 n +0000251462 00000 n +0000251518 00000 n +0000251575 00000 n +0000251737 00000 n +0000265394 00000 n +0000265664 00000 n +0000265709 00000 n +0000265766 00000 n +0000265823 00000 n +0000265880 00000 n +0000265938 00000 n +0000265995 00000 n +0000266053 00000 n +0000266215 00000 n +0000266273 00000 n +0000266331 00000 n +0000266388 00000 n +0000285535 00000 n +0000285813 00000 n +0000285870 00000 n +0000286197 00000 n +0000286339 00000 n +0000286385 00000 n +0000286443 00000 n +0000286501 00000 n +0000286559 00000 n +0000286723 00000 n +0000286780 00000 n +0000304086 00000 n +0000304356 00000 n +0000304401 00000 n +0000304458 00000 n +0000304515 00000 n +0000304679 00000 n +0000304736 00000 n +0000304793 00000 n +0000304850 00000 n +0000304908 00000 n +0000324036 00000 n +0000324322 00000 n +0000324474 00000 n +0000324531 00000 n +0000324588 00000 n +0000324645 00000 n +0000324703 00000 n +0000324866 00000 n +0000324923 00000 n +0000325223 00000 n +0000325281 00000 n +0000325339 00000 n +0000325663 00000 n +0000325721 00000 n +0000325884 00000 n +0000344234 00000 n +0000344520 00000 n +0000344565 00000 n +0000344622 00000 n +0000344679 00000 n +0000344736 00000 n +0000344899 00000 n +0000344956 00000 n +0000345013 00000 n +0000345071 00000 n +0000345228 00000 n +0000345286 00000 n +0000345450 00000 n +0000345508 00000 n +0000362599 00000 n +0000362885 00000 n +0000362930 00000 n +0000362987 00000 n +0000363044 00000 n +0000363207 00000 n +0000363265 00000 n +0000363442 00000 n +0000363499 00000 n +0000363557 00000 n +0000363615 00000 n +0000363673 00000 n +0000363830 00000 n +0000380164 00000 n +0000380442 00000 n +0000380487 00000 n +0000380649 00000 n +0000380706 00000 n +0000380763 00000 n +0000380820 00000 n +0000380877 00000 n +0000380934 00000 n +0000381097 00000 n +0000381155 00000 n +0000381212 00000 n +0000381269 00000 n +0000396508 00000 n +0000396786 00000 n +0000396831 00000 n +0000397187 00000 n +0000397346 00000 n +0000397403 00000 n +0000397460 00000 n +0000397517 00000 n +0000397901 00000 n +0000397958 00000 n +0000398118 00000 n +0000398176 00000 n +0000398233 00000 n +0000398291 00000 n +0000398349 00000 n +0000413097 00000 n +0000413367 00000 n +0000413424 00000 n +0000413481 00000 n +0000413538 00000 n +0000413595 00000 n +0000413754 00000 n +0000413812 00000 n +0000414210 00000 n +0000414268 00000 n +0000414326 00000 n +0000433587 00000 n +0000433865 00000 n +0000433911 00000 n +0000434060 00000 n +0000434117 00000 n +0000434175 00000 n +0000434221 00000 n +0000434267 00000 n +0000434438 00000 n +0000434496 00000 n +0000434554 00000 n +0000434612 00000 n +0000434889 00000 n +0000443541 00000 n +0000443811 00000 n +0000443856 00000 n +0000443913 00000 n +0000443970 00000 n +0000444292 00000 n +0000444349 00000 n +0000444520 00000 n +0000444577 00000 n +0000461777 00000 n +0000462034 00000 n +0000462079 00000 n +0000462136 00000 n +0000462182 00000 n +0000462240 00000 n +0000462418 00000 n +0000482324 00000 n +0000482581 00000 n +0000482627 00000 n +0000482781 00000 n +0000482839 00000 n +0000483145 00000 n +0000503693 00000 n +0000503966 00000 n +0000504127 00000 n +0000504184 00000 n +0000504241 00000 n +0000504411 00000 n +0000504578 00000 n +0000525981 00000 n +0000526254 00000 n +0000526403 00000 n +0000526574 00000 n +0000526733 00000 n +0000526790 00000 n +0000548621 00000 n +0000548910 00000 n +0000549078 00000 n +0000549225 00000 n +0000549374 00000 n +0000549525 00000 n +0000549685 00000 n +0000549743 00000 n +0000572703 00000 n +0000572992 00000 n +0000573161 00000 n +0000573329 00000 n +0000573499 00000 n +0000573671 00000 n +0000573831 00000 n +0000595480 00000 n +0000595769 00000 n +0000595814 00000 n +0000595973 00000 n +0000596131 00000 n +0000596291 00000 n +0000596442 00000 n +0000596592 00000 n +0000619390 00000 n +0000619679 00000 n +0000619736 00000 n +0000619906 00000 n +0000620077 00000 n +0000620244 00000 n +0000620416 00000 n +0000620591 00000 n +0000642864 00000 n +0000643145 00000 n +0000643285 00000 n +0000643461 00000 n +0000643518 00000 n +0000643687 00000 n +0000643874 00000 n +0000664547 00000 n +0000664820 00000 n +0000664865 00000 n +0000665028 00000 n +0000665074 00000 n +0000665263 00000 n +0000665425 00000 n +0000686091 00000 n +0000686364 00000 n +0000686421 00000 n +0000686853 00000 n +0000687029 00000 n +0000687201 00000 n +0000687258 00000 n +0000687427 00000 n +0000707761 00000 n +0000708058 00000 n +0000708207 00000 n +0000708362 00000 n +0000708506 00000 n +0000708671 00000 n +0000708729 00000 n +0000708775 00000 n +0000708946 00000 n +0000709093 00000 n +0000730766 00000 n +0000731047 00000 n +0000731190 00000 n +0000731345 00000 n +0000731489 00000 n +0000731547 00000 n +0000731718 00000 n +0000742919 00000 n +0000743192 00000 n +0000743347 00000 n +0000743404 00000 n +0000743553 00000 n +0000743702 00000 n +0000743846 00000 n +0000743991 00000 n +0000744156 00000 n +0000744312 00000 n +0000744470 00000 n +0000744617 00000 n +0000744779 00000 n +0000744921 00000 n +0000745086 00000 n +0000745230 00000 n +0000745387 00000 n +0000745533 00000 n +0000745689 00000 n +0000745834 00000 n +0000745989 00000 n +0000746133 00000 n +0000746292 00000 n +0000746440 00000 n +0000746598 00000 n +0000746745 00000 n +0000746911 00000 n +0000747056 00000 n +0000747216 00000 n +0000747365 00000 n +0000747523 00000 n +0000747670 00000 n +0000747825 00000 n +0000747970 00000 n +0000748130 00000 n +0000748279 00000 n +0000748439 00000 n +0000748588 00000 n +0000748743 00000 n +0000748888 00000 n +0000749056 00000 n +0000749203 00000 n +0000749362 00000 n +0000749510 00000 n +0000749666 00000 n +0000749812 00000 n +0000749972 00000 n +0000750121 00000 n +0000750287 00000 n +0000750432 00000 n +0000750592 00000 n +0000750741 00000 n +0000750899 00000 n +0000751046 00000 n +0000751213 00000 n +0000751359 00000 n +0000751531 00000 n +0000751682 00000 n +0000751841 00000 n +0000751989 00000 n +0000752147 00000 n +0000752294 00000 n +0000752448 00000 n +0000752592 00000 n +0000752764 00000 n +0000752915 00000 n +0000753076 00000 n +0000753226 00000 n +0000753385 00000 n +0000753534 00000 n +0000753694 00000 n +0000753843 00000 n +0000754009 00000 n +0000754154 00000 n +0000754324 00000 n +0000754473 00000 n +0000754632 00000 n +0000754780 00000 n +0000754926 00000 n +0000755061 00000 n +0000755215 00000 n +0000755348 00000 n +0000755507 00000 n +0000755645 00000 n +0000755793 00000 n +0000755931 00000 n +0000756100 00000 n +0000756248 00000 n +0000756412 00000 n +0000756556 00000 n +0000756726 00000 n +0000756875 00000 n +0000757034 00000 n +0000757183 00000 n +0000757352 00000 n +0000757500 00000 n +0000757663 00000 n +0000757807 00000 n +0000757977 00000 n +0000758126 00000 n +0000758285 00000 n +0000758434 00000 n +0000758592 00000 n +0000758739 00000 n +0000758908 00000 n +0000759056 00000 n +0000759222 00000 n +0000759367 00000 n +0000759538 00000 n +0000759688 00000 n +0000759848 00000 n +0000759998 00000 n +0000760160 00000 n +0000760303 00000 n +0000760473 00000 n +0000760622 00000 n +0000760782 00000 n +0000760932 00000 n +0000761103 00000 n +0000761253 00000 n +0000761408 00000 n +0000761552 00000 n +0000761711 00000 n +0000761860 00000 n +0000762029 00000 n +0000762177 00000 n +0000762332 00000 n +0000762477 00000 n +0000762649 00000 n +0000762800 00000 n +0000762960 00000 n +0000763110 00000 n +0000763279 00000 n +0000763427 00000 n +0000763592 00000 n +0000763737 00000 n +0000763910 00000 n +0000764062 00000 n +0000764223 00000 n +0000764374 00000 n +0000764545 00000 n +0000764695 00000 n +0000764860 00000 n +0000765005 00000 n +0000765178 00000 n +0000765330 00000 n +0000765491 00000 n +0000765642 00000 n +0000765812 00000 n +0000765961 00000 n +0000766124 00000 n +0000766285 00000 n +0000766425 00000 n +0000766566 00000 n +0000766726 00000 n +0000766864 00000 n +0000767012 00000 n +0000767149 00000 n +0000767307 00000 n +0000767443 00000 n +0000767608 00000 n +0000767751 00000 n +0000767922 00000 n +0000768071 00000 n +0000768230 00000 n +0000768378 00000 n +0000768547 00000 n +0000768694 00000 n +0000768848 00000 n +0000768991 00000 n 0000769162 00000 n -0000769310 00000 n -0000769447 00000 n -0000769605 00000 n -0000769741 00000 n -0000769907 00000 n -0000770051 00000 n -0000770222 00000 n -0000770371 00000 n -0000770530 00000 n -0000770678 00000 n -0000770847 00000 n -0000770994 00000 n -0000771149 00000 n -0000771293 00000 n -0000771464 00000 n -0000771613 00000 n -0000771772 00000 n -0000771920 00000 n -0000772089 00000 n -0000772236 00000 n -0000772402 00000 n -0000772546 00000 n -0000772717 00000 n -0000772866 00000 n -0000773026 00000 n -0000773175 00000 n -0000773345 00000 n -0000773493 00000 n -0000773658 00000 n -0000773803 00000 n -0000773974 00000 n -0000774123 00000 n -0000774282 00000 n -0000774430 00000 n -0000774600 00000 n -0000774748 00000 n -0000774914 00000 n -0000775060 00000 n -0000775232 00000 n -0000775382 00000 n -0000775541 00000 n -0000775689 00000 n -0000775847 00000 n -0000775993 00000 n -0000776163 00000 n -0000776311 00000 n -0000776478 00000 n -0000776623 00000 n -0000776795 00000 n -0000776945 00000 n -0000777104 00000 n -0000777252 00000 n -0000777412 00000 n -0000777560 00000 n -0000777731 00000 n -0000777880 00000 n -0000778045 00000 n -0000778191 00000 n -0000778364 00000 n -0000778515 00000 n -0000778676 00000 n -0000778826 00000 n -0000778986 00000 n -0000779134 00000 n -0000779305 00000 n -0000779454 00000 n -0000779611 00000 n -0000779756 00000 n -0000779925 00000 n -0000780072 00000 n -0000780231 00000 n -0000780379 00000 n -0000780536 00000 n -0000780671 00000 n -0000780823 00000 n -0000780956 00000 n -0000781116 00000 n -0000781254 00000 n -0000781402 00000 n -0000781539 00000 n -0000781697 00000 n -0000781843 00000 n -0000782012 00000 n -0000782159 00000 n +0000769311 00000 n +0000769470 00000 n +0000769618 00000 n +0000769787 00000 n +0000769934 00000 n +0000770099 00000 n +0000770242 00000 n +0000770413 00000 n +0000770562 00000 n +0000770722 00000 n +0000770871 00000 n +0000771041 00000 n +0000771189 00000 n +0000771353 00000 n +0000771497 00000 n +0000771668 00000 n +0000771817 00000 n +0000771976 00000 n +0000772124 00000 n +0000772294 00000 n +0000772442 00000 n +0000772606 00000 n +0000772750 00000 n +0000772922 00000 n +0000773072 00000 n +0000773231 00000 n +0000773379 00000 n +0000773537 00000 n +0000773683 00000 n +0000773853 00000 n +0000774001 00000 n +0000774166 00000 n +0000774309 00000 n +0000774481 00000 n +0000774631 00000 n +0000774790 00000 n +0000774938 00000 n +0000775098 00000 n +0000775246 00000 n +0000775417 00000 n +0000775566 00000 n +0000775729 00000 n +0000775873 00000 n +0000776046 00000 n +0000776197 00000 n +0000776358 00000 n +0000776508 00000 n +0000776668 00000 n +0000776816 00000 n +0000776987 00000 n +0000777136 00000 n +0000777291 00000 n +0000777434 00000 n +0000777603 00000 n +0000777750 00000 n +0000777909 00000 n +0000778057 00000 n +0000778214 00000 n +0000778349 00000 n +0000778500 00000 n +0000778632 00000 n +0000778792 00000 n +0000778930 00000 n +0000779078 00000 n +0000779215 00000 n +0000779373 00000 n +0000779519 00000 n +0000779688 00000 n +0000779835 00000 n +0000779998 00000 n +0000780141 00000 n +0000780300 00000 n +0000780448 00000 n +0000780617 00000 n +0000780764 00000 n +0000780929 00000 n +0000781072 00000 n +0000781243 00000 n +0000781392 00000 n +0000781551 00000 n +0000781699 00000 n +0000781868 00000 n +0000782015 00000 n +0000782180 00000 n 0000782323 00000 n -0000782467 00000 n -0000782626 00000 n -0000782774 00000 n -0000782943 00000 n -0000783090 00000 n -0000783256 00000 n -0000783400 00000 n -0000783571 00000 n -0000783720 00000 n -0000783879 00000 n -0000784027 00000 n -0000784196 00000 n -0000784343 00000 n -0000784509 00000 n -0000784653 00000 n -0000784825 00000 n -0000784975 00000 n -0000785135 00000 n -0000785284 00000 n -0000785454 00000 n -0000785602 00000 n -0000785768 00000 n -0000785912 00000 n -0000786083 00000 n -0000786232 00000 n -0000786392 00000 n -0000786541 00000 n -0000786701 00000 n +0000782495 00000 n +0000782645 00000 n +0000782805 00000 n +0000782954 00000 n +0000783124 00000 n +0000783272 00000 n +0000783437 00000 n +0000783580 00000 n +0000783751 00000 n +0000783900 00000 n +0000784060 00000 n +0000784209 00000 n +0000784369 00000 n +0000784517 00000 n +0000784687 00000 n +0000784835 00000 n +0000784990 00000 n +0000785133 00000 n +0000785292 00000 n +0000785440 00000 n +0000785610 00000 n +0000785758 00000 n +0000785913 00000 n +0000786057 00000 n +0000786217 00000 n +0000786366 00000 n +0000786535 00000 n +0000786682 00000 n 0000786849 00000 n -0000787019 00000 n +0000786994 00000 n 0000787167 00000 n -0000787323 00000 n -0000787467 00000 n -0000787626 00000 n -0000787774 00000 n -0000787944 00000 n -0000788092 00000 n -0000788248 00000 n -0000788393 00000 n -0000788553 00000 n -0000788702 00000 n -0000788871 00000 n -0000789018 00000 n -0000789186 00000 n -0000789332 00000 n -0000789505 00000 n -0000789656 00000 n -0000789817 00000 n -0000789967 00000 n -0000790138 00000 n -0000790287 00000 n -0000790458 00000 n -0000790607 00000 n -0000790783 00000 n -0000790937 00000 n -0000791112 00000 n -0000791265 00000 n -0000791424 00000 n -0000791571 00000 n -0000791734 00000 n -0000791885 00000 n -0000792049 00000 n -0000792202 00000 n -0000792358 00000 n -0000792504 00000 n -0000792660 00000 n -0000792794 00000 n -0000792949 00000 n -0000793082 00000 n -0000793239 00000 n -0000793374 00000 n -0000793545 00000 n -0000793694 00000 n -0000793856 00000 n -0000793996 00000 n -0000794159 00000 n -0000794311 00000 n -0000794476 00000 n -0000794619 00000 n -0000794789 00000 n -0000794937 00000 n -0000795121 00000 n -0000795285 00000 n -0000795461 00000 n -0000795615 00000 n -0000795779 00000 n -0000795921 00000 n -0000796096 00000 n -0000796249 00000 n -0000796418 00000 n -0000796565 00000 n -0000796731 00000 n -0000796875 00000 n -0000797160 00000 n -0000797239 00000 n -0000797403 00000 n -0000797594 00000 n -0000797822 00000 n -0000798039 00000 n -0000798209 00000 n -0000798427 00000 n -0000798673 00000 n -0000798846 00000 n -0000799027 00000 n -0000799292 00000 n -0000799477 00000 n -0000799658 00000 n -0000799939 00000 n -0000800124 00000 n -0000800305 00000 n -0000800562 00000 n -0000800735 00000 n -0000800916 00000 n -0000801172 00000 n -0000801361 00000 n -0000801560 00000 n -0000801755 00000 n -0000801936 00000 n -0000802257 00000 n -0000802443 00000 n -0000802612 00000 n -0000802936 00000 n -0000803125 00000 n -0000803324 00000 n -0000803505 00000 n -0000803789 00000 n -0000803979 00000 n -0000804179 00000 n -0000804375 00000 n -0000804544 00000 n -0000804840 00000 n -0000805029 00000 n -0000805228 00000 n -0000805409 00000 n -0000805794 00000 n -0000805988 00000 n -0000806191 00000 n -0000806377 00000 n -0000806889 00000 n -0000807082 00000 n -0000807286 00000 n -0000807471 00000 n -0000807896 00000 n -0000808090 00000 n -0000808294 00000 n -0000808493 00000 n -0000808678 00000 n -0000808986 00000 n -0000809179 00000 n -0000809368 00000 n -0000809676 00000 n -0000809869 00000 n -0000810073 00000 n -0000810247 00000 n -0000810532 00000 n -0000810722 00000 n -0000810908 00000 n -0000811230 00000 n -0000811424 00000 n -0000811629 00000 n -0000811816 00000 n -0000812342 00000 n -0000812536 00000 n -0000812740 00000 n -0000812915 00000 n -0000813433 00000 n -0000813628 00000 n -0000813833 00000 n -0000814019 00000 n -0000814596 00000 n -0000814790 00000 n -0000814994 00000 n -0000815180 00000 n -0000815493 00000 n -0000815687 00000 n -0000815892 00000 n -0000816078 00000 n -0000816379 00000 n -0000816573 00000 n -0000816778 00000 n -0000816964 00000 n -0000817274 00000 n -0000817469 00000 n -0000817674 00000 n -0000817848 00000 n -0000818165 00000 n -0000818359 00000 n -0000818563 00000 n -0000818749 00000 n -0000819126 00000 n -0000819321 00000 n -0000819526 00000 n -0000819727 00000 n -0000819901 00000 n -0000820286 00000 n -0000820480 00000 n -0000820685 00000 n -0000820885 00000 n -0000821072 00000 n -0000821462 00000 n -0000821657 00000 n -0000821849 00000 n -0000822049 00000 n -0000822235 00000 n -0000822516 00000 n -0000822710 00000 n -0000822914 00000 n -0000823101 00000 n -0000823394 00000 n -0000823588 00000 n -0000823780 00000 n -0000823980 00000 n -0000824166 00000 n -0000824455 00000 n -0000824645 00000 n -0000824832 00000 n -0000825297 00000 n -0000825492 00000 n -0000825697 00000 n -0000825883 00000 n -0000826328 00000 n -0000826522 00000 n -0000826726 00000 n -0000826913 00000 n -0000827359 00000 n -0000827554 00000 n -0000827747 00000 n -0000827947 00000 n -0000828134 00000 n -0000828380 00000 n -0000828559 00000 n -0000828746 00000 n -0000829028 00000 n -0000829219 00000 n -0000829393 00000 n -0000829696 00000 n -0000829890 00000 n -0000830094 00000 n -0000830280 00000 n -0000830508 00000 n -0000830714 00000 n -0000830919 00000 n -0000831116 00000 n -0000831329 00000 n -0000831554 00000 n -0000831798 00000 n -0000831990 00000 n -0000832178 00000 n -0000832375 00000 n -0000832575 00000 n -0000832751 00000 n -0000832975 00000 n -0000833151 00000 n -0000833348 00000 n -0000833620 00000 n -0000833852 00000 n -0000834036 00000 n -0000834265 00000 n -0000834458 00000 n -0000834621 00000 n -0000835261 00000 n -0000843269 00000 n -0000843485 00000 n -0000844848 00000 n -0000845915 00000 n -0000853667 00000 n -0000853888 00000 n -0000855251 00000 n -0000856328 00000 n -0000859589 00000 n -0000859815 00000 n -0000861178 00000 n -0000862294 00000 n -0000864437 00000 n -0000864651 00000 n -0000866014 00000 n +0000787318 00000 n +0000787479 00000 n +0000787629 00000 n +0000787800 00000 n +0000787949 00000 n +0000788120 00000 n +0000788269 00000 n +0000788445 00000 n +0000788599 00000 n +0000788774 00000 n +0000788927 00000 n +0000789086 00000 n +0000789233 00000 n +0000789396 00000 n +0000789547 00000 n +0000789711 00000 n +0000789864 00000 n +0000790020 00000 n +0000790166 00000 n +0000790322 00000 n +0000790456 00000 n +0000790611 00000 n +0000790744 00000 n +0000790901 00000 n +0000791036 00000 n +0000791207 00000 n +0000791356 00000 n +0000791518 00000 n +0000791658 00000 n +0000791821 00000 n +0000791973 00000 n +0000792138 00000 n +0000792281 00000 n +0000792451 00000 n +0000792599 00000 n +0000792783 00000 n +0000792947 00000 n +0000793123 00000 n +0000793277 00000 n +0000793441 00000 n +0000793583 00000 n +0000793758 00000 n +0000793911 00000 n +0000794080 00000 n +0000794227 00000 n +0000794393 00000 n +0000794537 00000 n +0000794822 00000 n +0000794901 00000 n +0000795065 00000 n +0000795256 00000 n +0000795484 00000 n +0000795701 00000 n +0000795871 00000 n +0000796089 00000 n +0000796335 00000 n +0000796508 00000 n +0000796689 00000 n +0000796954 00000 n +0000797139 00000 n +0000797320 00000 n +0000797601 00000 n +0000797786 00000 n +0000797967 00000 n +0000798224 00000 n +0000798397 00000 n +0000798578 00000 n +0000798834 00000 n +0000799023 00000 n +0000799222 00000 n +0000799417 00000 n +0000799598 00000 n +0000799919 00000 n +0000800105 00000 n +0000800274 00000 n +0000800598 00000 n +0000800787 00000 n +0000800986 00000 n +0000801167 00000 n +0000801451 00000 n +0000801641 00000 n +0000801841 00000 n +0000802037 00000 n +0000802206 00000 n +0000802502 00000 n +0000802691 00000 n +0000802890 00000 n +0000803071 00000 n +0000803456 00000 n +0000803650 00000 n +0000803853 00000 n +0000804039 00000 n +0000804551 00000 n +0000804744 00000 n +0000804948 00000 n +0000805133 00000 n +0000805558 00000 n +0000805752 00000 n +0000805956 00000 n +0000806155 00000 n +0000806340 00000 n +0000806648 00000 n +0000806841 00000 n +0000807030 00000 n +0000807338 00000 n +0000807531 00000 n +0000807735 00000 n +0000807909 00000 n +0000808194 00000 n +0000808384 00000 n +0000808570 00000 n +0000808892 00000 n +0000809086 00000 n +0000809291 00000 n +0000809478 00000 n +0000810004 00000 n +0000810198 00000 n +0000810402 00000 n +0000810577 00000 n +0000811095 00000 n +0000811290 00000 n +0000811495 00000 n +0000811681 00000 n +0000812258 00000 n +0000812452 00000 n +0000812656 00000 n +0000812842 00000 n +0000813155 00000 n +0000813349 00000 n +0000813554 00000 n +0000813740 00000 n +0000814041 00000 n +0000814235 00000 n +0000814440 00000 n +0000814626 00000 n +0000814936 00000 n +0000815131 00000 n +0000815336 00000 n +0000815510 00000 n +0000815827 00000 n +0000816021 00000 n +0000816225 00000 n +0000816411 00000 n +0000816788 00000 n +0000816983 00000 n +0000817188 00000 n +0000817389 00000 n +0000817563 00000 n +0000817948 00000 n +0000818142 00000 n +0000818347 00000 n +0000818547 00000 n +0000818734 00000 n +0000819124 00000 n +0000819319 00000 n +0000819511 00000 n +0000819711 00000 n +0000819897 00000 n +0000820178 00000 n +0000820372 00000 n +0000820576 00000 n +0000820763 00000 n +0000821056 00000 n +0000821250 00000 n +0000821442 00000 n +0000821642 00000 n +0000821828 00000 n +0000822117 00000 n +0000822307 00000 n +0000822494 00000 n +0000822959 00000 n +0000823154 00000 n +0000823359 00000 n +0000823545 00000 n +0000823990 00000 n +0000824184 00000 n +0000824388 00000 n +0000824575 00000 n +0000825021 00000 n +0000825216 00000 n +0000825409 00000 n +0000825609 00000 n +0000825796 00000 n +0000826042 00000 n +0000826221 00000 n +0000826408 00000 n +0000826690 00000 n +0000826881 00000 n +0000827055 00000 n +0000827358 00000 n +0000827552 00000 n +0000827756 00000 n +0000827942 00000 n +0000828170 00000 n +0000828376 00000 n +0000828581 00000 n +0000828778 00000 n +0000828991 00000 n +0000829216 00000 n +0000829460 00000 n +0000829652 00000 n +0000829840 00000 n +0000830037 00000 n +0000830237 00000 n +0000830413 00000 n +0000830637 00000 n +0000830813 00000 n +0000831010 00000 n +0000831282 00000 n +0000831514 00000 n +0000831699 00000 n +0000831916 00000 n +0000832121 00000 n +0000832295 00000 n +0000832935 00000 n +0000840943 00000 n +0000841159 00000 n +0000842522 00000 n +0000843589 00000 n +0000851341 00000 n +0000851562 00000 n +0000852925 00000 n +0000854002 00000 n +0000857263 00000 n +0000857489 00000 n +0000858852 00000 n +0000859968 00000 n +0000862111 00000 n +0000862325 00000 n +0000863688 00000 n trailer -<< /Size 859 +<< /Size 860 /Root 2 0 R /Info 1 0 R >> startxref -867140 +864814 %%EOF diff --git a/extra/bin-for-dev/start-db.sh b/extra/bin-for-dev/start-db.sh index 99286fccb..97f8de1f5 100755 --- a/extra/bin-for-dev/start-db.sh +++ b/extra/bin-for-dev/start-db.sh @@ -26,7 +26,7 @@ docker-compose -f ../docker/clamp/docker-compose.yml up -d db if [ "$1" = "test" ]; then - while ! (docker logs clamp_db_1 2>&1 | grep "socket: '/var/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution" > /dev/null); + while ! (docker logs clamp_db_1 2>&1 | grep "socket: '/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution" > /dev/null); do echo "Waiting Mysql to be up with CLDSDB4 db loaded before loading the TEST DATA ..." sleep 3 diff --git a/extra/sql/dump/test-data.sql b/extra/sql/dump/test-data.sql index 15ac2551c..a319b7b0f 100644 --- a/extra/sql/dump/test-data.sql +++ b/extra/sql/dump/test-data.sql @@ -26,8 +26,8 @@ USE `cldsdb4`; LOCK TABLES `dictionary` WRITE; /*!40000 ALTER TABLE `dictionary` DISABLE KEYS */; -INSERT INTO `dictionary` VALUES ('DefaultActors','admin','2020-08-03 15:22:46.896924','admin','2020-08-03 15:22:46.896924',0,''); -INSERT INTO `dictionary` VALUES ('DefaultOperations','admin','2020-08-03 15:22:46.928662','admin','2020-08-03 15:22:46.928662',0,''); +INSERT INTO `dictionary` VALUES ('DefaultActors','Not found','2020-10-09 17:11:39.923782','Not found','2020-10-09 17:11:39.923782',0,''); +INSERT INTO `dictionary` VALUES ('DefaultOperations','Not found','2020-10-09 17:11:40.013259','Not found','2020-10-09 17:11:40.013259',0,''); /*!40000 ALTER TABLE `dictionary` ENABLE KEYS */; UNLOCK TABLES; @@ -37,20 +37,20 @@ UNLOCK TABLES; LOCK TABLES `dictionary_elements` WRITE; /*!40000 ALTER TABLE `dictionary_elements` DISABLE KEYS */; -INSERT INTO `dictionary_elements` VALUES ('APPC','admin','2020-08-03 15:22:46.914230','admin','2020-08-03 15:22:46.914230','APPC component','APPC',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('BandwidthOnDemand (SDNC operation)','admin','2020-08-03 15:22:46.930700','admin','2020-08-03 15:22:46.930700','SDNC operation','BandwidthOnDemand',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('Health-Check (APPC operation)','admin','2020-08-03 15:22:46.946269','admin','2020-08-03 15:22:46.946269','APPC operation','Health-Check',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('Migrate (APPC operation)','admin','2020-08-03 15:22:46.944253','admin','2020-08-03 15:22:46.944253','APPC operation','Migrate',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('ModifyConfig (APPC/VFC operation)','admin','2020-08-03 15:22:46.940378','admin','2020-08-03 15:22:46.940378','APPC/VFC operation','ModifyConfig',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('Rebuild (APPC operation)','admin','2020-08-03 15:22:46.938606','admin','2020-08-03 15:22:46.938606','APPC operation','Rebuild',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('Reroute (SDNC operation)','admin','2020-08-03 15:22:46.934812','admin','2020-08-03 15:22:46.934812','SDNC operation','Reroute',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('Restart (APPC operation)','admin','2020-08-03 15:22:46.942188','admin','2020-08-03 15:22:46.942188','APPC operation','Restart',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('SDNC','admin','2020-08-03 15:22:46.908861','admin','2020-08-03 15:22:46.908861','SDNC component','SDNC',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('SDNR','admin','2020-08-03 15:22:46.906526','admin','2020-08-03 15:22:46.906526','SDNR component','SDNR',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('SO','admin','2020-08-03 15:22:46.912430','admin','2020-08-03 15:22:46.912430','SO component','SO',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('VF Module Create (SO operation)','admin','2020-08-03 15:22:46.936786','admin','2020-08-03 15:22:46.936786','SO operation','VF Module Create',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('VF Module Delete (SO operation)','admin','2020-08-03 15:22:46.932797','admin','2020-08-03 15:22:46.932797','SO operation','VF Module Delete',NULL,'string'); -INSERT INTO `dictionary_elements` VALUES ('VFC','admin','2020-08-03 15:22:46.910502','admin','2020-08-03 15:22:46.910502','VFC component','VFC',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('APPC','Not found','2020-10-09 17:11:39.960011','Not found','2020-10-09 17:11:39.960011','APPC component','APPC',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('BandwidthOnDemand (SDNC operation)','Not found','2020-10-09 17:11:40.015148','Not found','2020-10-09 17:11:40.015148','SDNC operation','BandwidthOnDemand',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('Health-Check (APPC operation)','Not found','2020-10-09 17:11:40.065809','Not found','2020-10-09 17:11:40.065809','APPC operation','Health-Check',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('Migrate (APPC operation)','Not found','2020-10-09 17:11:40.061300','Not found','2020-10-09 17:11:40.061300','APPC operation','Migrate',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('ModifyConfig (APPC/VFC operation)','Not found','2020-10-09 17:11:40.048127','Not found','2020-10-09 17:11:40.048127','APPC/VFC operation','ModifyConfig',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('Rebuild (APPC operation)','Not found','2020-10-09 17:11:40.044193','Not found','2020-10-09 17:11:40.044193','APPC operation','Rebuild',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('Reroute (SDNC operation)','Not found','2020-10-09 17:11:40.031946','Not found','2020-10-09 17:11:40.031946','SDNC operation','Reroute',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('Restart (APPC operation)','Not found','2020-10-09 17:11:40.057051','Not found','2020-10-09 17:11:40.057051','APPC operation','Restart',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('SDNC','Not found','2020-10-09 17:11:39.943208','Not found','2020-10-09 17:11:39.943208','SDNC component','SDNC',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('SDNR','Not found','2020-10-09 17:11:39.940697','Not found','2020-10-09 17:11:39.940697','SDNR component','SDNR',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('SO','Not found','2020-10-09 17:11:39.954184','Not found','2020-10-09 17:11:39.954184','SO component','SO',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('VF Module Create (SO operation)','Not found','2020-10-09 17:11:40.036281','Not found','2020-10-09 17:11:40.036281','SO operation','VF Module Create',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('VF Module Delete (SO operation)','Not found','2020-10-09 17:11:40.028817','Not found','2020-10-09 17:11:40.028817','SO operation','VF Module Delete',NULL,'string'); +INSERT INTO `dictionary_elements` VALUES ('VFC','Not found','2020-10-09 17:11:39.951016','Not found','2020-10-09 17:11:39.951016','VFC component','VFC',NULL,'string'); /*!40000 ALTER TABLE `dictionary_elements` ENABLE KEYS */; UNLOCK TABLES; @@ -93,7 +93,7 @@ UNLOCK TABLES; LOCK TABLES `loop_element_models` WRITE; /*!40000 ALTER TABLE `loop_element_models` DISABLE KEYS */; -INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-08-03 15:21:33.039868','Not found','2020-08-03 15:21:33.246281',NULL,NULL,'MICRO_SERVICE_TYPE',NULL); +INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-10-09 17:11:38.266040','Not found','2020-10-09 17:11:38.542649',NULL,NULL,'MICRO_SERVICE_TYPE',NULL); /*!40000 ALTER TABLE `loop_element_models` ENABLE KEYS */; UNLOCK TABLES; @@ -112,9 +112,9 @@ UNLOCK TABLES; LOCK TABLES `loop_templates` WRITE; /*!40000 ALTER TABLE `loop_templates` DISABLE KEYS */; -INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_xektp_v1_0_ResourceInstanceName1_tca','Not found','2020-08-03 15:21:33.219214','Not found','2020-08-03 15:21:33.219214','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n location_id:\n type: string\n service_id:\n type: string\n policy_id:\n type: string\nnode_templates:\n policy_0:\n type: dcae.nodes.policy\n properties:\n policy_id: \n get_input: policy_id\n policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n cdap_host_host:\n type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n properties:\n location_id:\n get_input: location_id\n scn_override: cdap_broker.solutioning-central.dcae.onap.org\n interfaces:\n cloudify.interfaces.lifecycle: {\n }\n tca_tca:\n type: dcae.nodes.MicroService.cdap\n properties:\n app_config:\n appDescription: DCAE Analytics Threshold Crossing Alert Application\n appName: dcae-tca\n tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n tcaVESAlertsTableName: TCAVESAlertsTable\n tcaVESAlertsTableTTLSeconds: \'1728000\'\n tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n tcaVESMessageStatusTableTTLSeconds: \'86400\'\n thresholdCalculatorFlowletInstances: \'2\'\n app_preferences:\n publisherContentType: application/json\n publisherHostName: mrlocal-mtnjftle01.onap.org\n publisherHostPort: \'3905\'\n publisherMaxBatchSize: \'10\'\n publisherMaxRecoveryQueueSize: \'100000\'\n publisherPollingInterval: \'20000\'\n publisherProtocol: https\n publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n publisherUserName: test@tca.af.dcae.onap.org\n publisherUserPassword: password\n subscriberConsumerGroup: OpenDCAE-c12\n subscriberConsumerId: c12\n subscriberContentType: application/json\n subscriberHostName: mrlocal-mtnjftle01.onap.org\n subscriberHostPort: \'3905\'\n subscriberMessageLimit: \'-1\'\n subscriberPollingInterval: \'20000\'\n subscriberProtocol: https\n subscriberTimeoutMS: \'-1\'\n subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n subscriberUserName: test@tca.af.dcae.onap.org\n subscriberUserPassword: password\n tca_policy: null\n artifact_name: dcae-analytics-tca\n artifact_version: 1.0.0\n connections:\n streams_publishes: [\n ]\n streams_subscribes: [\n ]\n jar_url: http://somejar\n location_id:\n get_input: location_id\n namespace: cdap_tca_hi_lo\n programs:\n - program_id: TCAVESCollectorFlow\n program_type: flows\n - program_id: TCADMaaPMRSubscriberWorker\n program_type: workers\n - program_id: TCADMaaPMRPublisherWorker\n program_type: workers\n service_component_type: cdap_app_tca\n service_id:\n get_input: service_id\n streamname: TCASubscriberOutputStream\n relationships:\n - target: topic0\n type: dcae.relationships.subscribe_to_events\n - target: topic1\n type: dcae.relationships.publish_events\n - target: cdap_host_host\n type: dcae.relationships.component_contained_in\n - target: policy_0\n type: dcae.relationships.depends_on\n topic0:\n type: dcae.nodes.Topic\n properties:\n topic_name: \'\'\n topic1:\n type: dcae.nodes.Topic\n properties:\n topic_name: \'\'\n \n','typeId-2f2efca0-ce95-48e1-951d-388fe9cb1c0b',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0'); -INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_xektp_v1_0_ResourceInstanceName1_tca_3','Not found','2020-08-03 15:21:33.140295','Not found','2020-08-03 15:21:33.140295','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml\n - \"https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml\"\n - \"https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml\"\ninputs:\n aaiEnrichmentHost:\n type: string\n default: \"aai.onap.svc.cluster.local\"\n aaiEnrichmentPort:\n type: string\n default: \"8443\"\n enableAAIEnrichment:\n type: string\n default: \"true\"\n dmaap_host:\n type: string\n default: \"message-router.onap.svc.cluster.local\"\n dmaap_port:\n type: string\n default: \"3904\"\n enableRedisCaching:\n type: string\n default: \"false\"\n redisHosts:\n type: string\n default: \"dcae-redis.onap.svc.cluster.local:6379\"\n tag_version:\n type: string\n default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.2.2\"\n consul_host:\n type: string\n default: \"consul-server.onap\"\n consul_port:\n type: string\n default: \"8500\"\n cbs_host:\n type: string\n default: \"config-binding-service\"\n cbs_port:\n type: string\n default: \"10000\"\n policy_id:\n type: string\n default: \"onap.restart.tca\"\n external_port:\n type: string\n description: Kubernetes node port on which CDAPgui is exposed\n default: \"32012\"\n policy_model_id:\n type: string\n default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n tca_k8s:\n type: dcae.nodes.ContainerizedServiceComponent\n relationships:\n - target: tca_policy\n type: cloudify.relationships.depends_on\n properties:\n service_component_type: \'dcaegen2-analytics-tca\'\n application_config: {}\n docker_config: {}\n image:\n get_input: tag_version\n log_info:\n log_directory: \"/opt/app/TCAnalytics/logs\"\n application_config:\n app_config:\n appDescription: DCAE Analytics Threshold Crossing Alert Application\n appName: dcae-tca\n tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n tcaVESAlertsTableName: TCAVESAlertsTable\n tcaVESAlertsTableTTLSeconds: \'1728000\'\n tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n tcaVESMessageStatusTableTTLSeconds: \'86400\'\n thresholdCalculatorFlowletInstances: \'2\'\n app_preferences:\n aaiEnrichmentHost:\n get_input: aaiEnrichmentHost\n aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n aaiEnrichmentPortNumber: \'8443\'\n aaiEnrichmentProtocol: https\n aaiEnrichmentUserName: dcae@dcae.onap.org\n aaiEnrichmentUserPassword: demo123456!\n aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n enableAAIEnrichment:\n get_input: enableAAIEnrichment\n enableRedisCaching:\n get_input: enableRedisCaching\n redisHosts:\n get_input: redisHosts\n enableAlertCEFFormat: \'false\'\n publisherContentType: application/json\n publisherHostName:\n get_input: dmaap_host\n publisherHostPort:\n get_input: dmaap_port\n publisherMaxBatchSize: \'1\'\n publisherMaxRecoveryQueueSize: \'100000\'\n publisherPollingInterval: \'20000\'\n publisherProtocol: http\n publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n subscriberConsumerGroup: OpenDCAE-clamp\n subscriberConsumerId: c12\n subscriberContentType: application/json\n subscriberHostName:\n get_input: dmaap_host\n subscriberHostPort:\n get_input: dmaap_port\n subscriberMessageLimit: \'-1\'\n subscriberPollingInterval: \'30000\'\n subscriberProtocol: http\n subscriberTimeoutMS: \'-1\'\n subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n #tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n tca_policy: \'\'\n service_component_type: dcaegen2-analytics_tca\n interfaces:\n cloudify.interfaces.lifecycle:\n start:\n inputs:\n envs:\n DMAAPHOST:\n { get_input: dmaap_host }\n DMAAPPORT: \"3904\"\n DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n AAIHOST:\n { get_input: aaiEnrichmentHost }\n AAIPORT: \"8443\"\n CONSUL_HOST:\n { get_input: consul_host }\n CONSUL_PORT: \"8500\"\n CBS_HOST:\n { get_input: cbs_host }\n CBS_PORT: \"10000\"\n CONFIG_BINDING_SERVICE: \"config_binding_service\"\n ports:\n - concat: [\"11011:\", { get_input: external_port }]\n tca_policy:\n type: clamp.nodes.policy\n properties:\n policy_id:\n get_input: policy_id\n policy_model_id:\n get_input: policy_model_id\n','typeId-bab9e4e8-fc3e-47a3-bea3-060167a12c25',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0'); -INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_xektp_v1_0_ResourceInstanceName2_tca_2','Not found','2020-08-03 15:21:33.014894','Not found','2020-08-03 15:21:33.014894','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n# - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n aaiEnrichmentHost:\n type: string\n default: \"aai.onap.svc.cluster.local\"\n aaiEnrichmentPort:\n type: string\n default: \"8443\"\n enableAAIEnrichment:\n type: string\n default: true\n dmaap_host:\n type: string\n default: message-router.onap\n dmaap_port:\n type: string\n default: \"3904\"\n enableRedisCaching:\n type: string\n default: false\n redisHosts:\n type: string\n default: dcae-redis.onap.svc.cluster.local:6379\n tag_version:\n type: string\n default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n consul_host:\n type: string\n default: consul-server.onap\n consul_port:\n type: string\n default: \"8500\"\n cbs_host:\n type: string\n default: \"config-binding-servicel\"\n cbs_port:\n type: string\n default: \"10000\"\n policy_id:\n type: string\n default: \"onap.restart.tca\"\n external_port:\n type: string\n description: Kubernetes node port on which CDAPgui is exposed\n default: \"32012\"\n policy_model_id:\n type: string\n default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n tca_k8s:\n type: dcae.nodes.ContainerizedServiceComponent\n relationships:\n - target: tca_policy\n type: cloudify.relationships.depends_on\n properties:\n service_component_type: \'dcaegen2-analytics-tca\'\n application_config: {}\n docker_config: {}\n image:\n get_input: tag_version\n log_info:\n log_directory: \"/opt/app/TCAnalytics/logs\"\n application_config:\n app_config:\n appDescription: DCAE Analytics Threshold Crossing Alert Application\n appName: dcae-tca\n tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n tcaVESAlertsTableName: TCAVESAlertsTable\n tcaVESAlertsTableTTLSeconds: \'1728000\'\n tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n tcaVESMessageStatusTableTTLSeconds: \'86400\'\n thresholdCalculatorFlowletInstances: \'2\'\n app_preferences:\n aaiEnrichmentHost:\n get_input: aaiEnrichmentHost\n aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n aaiEnrichmentPortNumber: \'8443\'\n aaiEnrichmentProtocol: https\n aaiEnrichmentUserName: dcae@dcae.onap.org\n aaiEnrichmentUserPassword: demo123456!\n aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n enableAAIEnrichment:\n get_input: enableAAIEnrichment\n enableRedisCaching:\n get_input: enableRedisCaching\n redisHosts:\n get_input: redisHosts\n enableAlertCEFFormat: \'false\'\n publisherContentType: application/json\n publisherHostName:\n get_input: dmaap_host\n publisherHostPort:\n get_input: dmaap_port\n publisherMaxBatchSize: \'1\'\n publisherMaxRecoveryQueueSize: \'100000\'\n publisherPollingInterval: \'20000\'\n publisherProtocol: http\n publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n subscriberConsumerGroup: OpenDCAE-clamp\n subscriberConsumerId: c12\n subscriberContentType: application/json\n subscriberHostName:\n get_input: dmaap_host\n subscriberHostPort:\n get_input: dmaap_port\n subscriberMessageLimit: \'-1\'\n subscriberPollingInterval: \'30000\'\n subscriberProtocol: http\n subscriberTimeoutMS: \'-1\'\n subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n# tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n service_component_type: dcaegen2-analytics_tca\n interfaces:\n cloudify.interfaces.lifecycle:\n start:\n inputs:\n envs:\n DMAAPHOST:\n { get_input: dmaap_host }\n DMAAPPORT:\n { get_input: dmaap_port }\n DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n AAIHOST:\n { get_input: aaiEnrichmentHost }\n AAIPORT:\n { get_input: aaiEnrichmentPort }\n CONSUL_HOST:\n { get_input: consul_host }\n CONSUL_PORT:\n { get_input: consul_port }\n CBS_HOST:\n { get_input: cbs_host }\n CBS_PORT:\n { get_input: cbs_port }\n CONFIG_BINDING_SERVICE: \"config_binding_service\"\n ports:\n - concat: [\"11011:\", { get_input: external_port }]\n tca_policy:\n type: clamp.nodes.policy\n properties:\n policy_id:\n get_input: policy_id\n policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-79ee1dcc-803e-4d17-8da5-c84cae49ce5e',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0'); +INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_U19Qe_v1_0_ResourceInstanceName1_tca','Not found','2020-10-09 17:11:38.503094','Not found','2020-10-09 17:11:38.503094','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n location_id:\n type: string\n service_id:\n type: string\n policy_id:\n type: string\nnode_templates:\n policy_0:\n type: dcae.nodes.policy\n properties:\n policy_id: \n get_input: policy_id\n policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n cdap_host_host:\n type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n properties:\n location_id:\n get_input: location_id\n scn_override: cdap_broker.solutioning-central.dcae.onap.org\n interfaces:\n cloudify.interfaces.lifecycle: {\n }\n tca_tca:\n type: dcae.nodes.MicroService.cdap\n properties:\n app_config:\n appDescription: DCAE Analytics Threshold Crossing Alert Application\n appName: dcae-tca\n tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n tcaVESAlertsTableName: TCAVESAlertsTable\n tcaVESAlertsTableTTLSeconds: \'1728000\'\n tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n tcaVESMessageStatusTableTTLSeconds: \'86400\'\n thresholdCalculatorFlowletInstances: \'2\'\n app_preferences:\n publisherContentType: application/json\n publisherHostName: mrlocal-mtnjftle01.onap.org\n publisherHostPort: \'3905\'\n publisherMaxBatchSize: \'10\'\n publisherMaxRecoveryQueueSize: \'100000\'\n publisherPollingInterval: \'20000\'\n publisherProtocol: https\n publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n publisherUserName: test@tca.af.dcae.onap.org\n publisherUserPassword: password\n subscriberConsumerGroup: OpenDCAE-c12\n subscriberConsumerId: c12\n subscriberContentType: application/json\n subscriberHostName: mrlocal-mtnjftle01.onap.org\n subscriberHostPort: \'3905\'\n subscriberMessageLimit: \'-1\'\n subscriberPollingInterval: \'20000\'\n subscriberProtocol: https\n subscriberTimeoutMS: \'-1\'\n subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n subscriberUserName: test@tca.af.dcae.onap.org\n subscriberUserPassword: password\n tca_policy: null\n artifact_name: dcae-analytics-tca\n artifact_version: 1.0.0\n connections:\n streams_publishes: [\n ]\n streams_subscribes: [\n ]\n jar_url: http://somejar\n location_id:\n get_input: location_id\n namespace: cdap_tca_hi_lo\n programs:\n - program_id: TCAVESCollectorFlow\n program_type: flows\n - program_id: TCADMaaPMRSubscriberWorker\n program_type: workers\n - program_id: TCADMaaPMRPublisherWorker\n program_type: workers\n service_component_type: cdap_app_tca\n service_id:\n get_input: service_id\n streamname: TCASubscriberOutputStream\n relationships:\n - target: topic0\n type: dcae.relationships.subscribe_to_events\n - target: topic1\n type: dcae.relationships.publish_events\n - target: cdap_host_host\n type: dcae.relationships.component_contained_in\n - target: policy_0\n type: dcae.relationships.depends_on\n topic0:\n type: dcae.nodes.Topic\n properties:\n topic_name: \'\'\n topic1:\n type: dcae.nodes.Topic\n properties:\n topic_name: \'\'\n \n','typeId-fc2ea033-6e47-49f5-b393-71e40d6678ca',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0'); +INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_U19Qe_v1_0_ResourceInstanceName1_tca_3','Not found','2020-10-09 17:11:38.401001','Not found','2020-10-09 17:11:38.401001','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml\n - \"https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml\"\n - \"https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml\"\ninputs:\n aaiEnrichmentHost:\n type: string\n default: \"aai.onap.svc.cluster.local\"\n aaiEnrichmentPort:\n type: string\n default: \"8443\"\n enableAAIEnrichment:\n type: string\n default: \"true\"\n dmaap_host:\n type: string\n default: \"message-router.onap.svc.cluster.local\"\n dmaap_port:\n type: string\n default: \"3904\"\n enableRedisCaching:\n type: string\n default: \"false\"\n redisHosts:\n type: string\n default: \"dcae-redis.onap.svc.cluster.local:6379\"\n tag_version:\n type: string\n default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.2.2\"\n consul_host:\n type: string\n default: \"consul-server.onap\"\n consul_port:\n type: string\n default: \"8500\"\n cbs_host:\n type: string\n default: \"config-binding-service\"\n cbs_port:\n type: string\n default: \"10000\"\n policy_id:\n type: string\n default: \"onap.restart.tca\"\n external_port:\n type: string\n description: Kubernetes node port on which CDAPgui is exposed\n default: \"32012\"\n policy_model_id:\n type: string\n default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n tca_k8s:\n type: dcae.nodes.ContainerizedServiceComponent\n relationships:\n - target: tca_policy\n type: cloudify.relationships.depends_on\n properties:\n service_component_type: \'dcaegen2-analytics-tca\'\n application_config: {}\n docker_config: {}\n image:\n get_input: tag_version\n log_info:\n log_directory: \"/opt/app/TCAnalytics/logs\"\n application_config:\n app_config:\n appDescription: DCAE Analytics Threshold Crossing Alert Application\n appName: dcae-tca\n tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n tcaVESAlertsTableName: TCAVESAlertsTable\n tcaVESAlertsTableTTLSeconds: \'1728000\'\n tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n tcaVESMessageStatusTableTTLSeconds: \'86400\'\n thresholdCalculatorFlowletInstances: \'2\'\n app_preferences:\n aaiEnrichmentHost:\n get_input: aaiEnrichmentHost\n aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n aaiEnrichmentPortNumber: \'8443\'\n aaiEnrichmentProtocol: https\n aaiEnrichmentUserName: dcae@dcae.onap.org\n aaiEnrichmentUserPassword: demo123456!\n aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n enableAAIEnrichment:\n get_input: enableAAIEnrichment\n enableRedisCaching:\n get_input: enableRedisCaching\n redisHosts:\n get_input: redisHosts\n enableAlertCEFFormat: \'false\'\n publisherContentType: application/json\n publisherHostName:\n get_input: dmaap_host\n publisherHostPort:\n get_input: dmaap_port\n publisherMaxBatchSize: \'1\'\n publisherMaxRecoveryQueueSize: \'100000\'\n publisherPollingInterval: \'20000\'\n publisherProtocol: http\n publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n subscriberConsumerGroup: OpenDCAE-clamp\n subscriberConsumerId: c12\n subscriberContentType: application/json\n subscriberHostName:\n get_input: dmaap_host\n subscriberHostPort:\n get_input: dmaap_port\n subscriberMessageLimit: \'-1\'\n subscriberPollingInterval: \'30000\'\n subscriberProtocol: http\n subscriberTimeoutMS: \'-1\'\n subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n #tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n tca_policy: \'\'\n service_component_type: dcaegen2-analytics_tca\n interfaces:\n cloudify.interfaces.lifecycle:\n start:\n inputs:\n envs:\n DMAAPHOST:\n { get_input: dmaap_host }\n DMAAPPORT: \"3904\"\n DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n AAIHOST:\n { get_input: aaiEnrichmentHost }\n AAIPORT: \"8443\"\n CONSUL_HOST:\n { get_input: consul_host }\n CONSUL_PORT: \"8500\"\n CBS_HOST:\n { get_input: cbs_host }\n CBS_PORT: \"10000\"\n CONFIG_BINDING_SERVICE: \"config_binding_service\"\n ports:\n - concat: [\"11011:\", { get_input: external_port }]\n tca_policy:\n type: clamp.nodes.policy\n properties:\n policy_id:\n get_input: policy_id\n policy_model_id:\n get_input: policy_model_id\n','typeId-4bf1b214-ba2a-4c11-b6ec-377a29a1fc2b',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0'); +INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_U19Qe_v1_0_ResourceInstanceName2_tca_2','Not found','2020-10-09 17:11:38.256597','Not found','2020-10-09 17:11:38.256597','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n# - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n aaiEnrichmentHost:\n type: string\n default: \"aai.onap.svc.cluster.local\"\n aaiEnrichmentPort:\n type: string\n default: \"8443\"\n enableAAIEnrichment:\n type: string\n default: true\n dmaap_host:\n type: string\n default: message-router.onap\n dmaap_port:\n type: string\n default: \"3904\"\n enableRedisCaching:\n type: string\n default: false\n redisHosts:\n type: string\n default: dcae-redis.onap.svc.cluster.local:6379\n tag_version:\n type: string\n default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n consul_host:\n type: string\n default: consul-server.onap\n consul_port:\n type: string\n default: \"8500\"\n cbs_host:\n type: string\n default: \"config-binding-servicel\"\n cbs_port:\n type: string\n default: \"10000\"\n policy_id:\n type: string\n default: \"onap.restart.tca\"\n external_port:\n type: string\n description: Kubernetes node port on which CDAPgui is exposed\n default: \"32012\"\n policy_model_id:\n type: string\n default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n tca_k8s:\n type: dcae.nodes.ContainerizedServiceComponent\n relationships:\n - target: tca_policy\n type: cloudify.relationships.depends_on\n properties:\n service_component_type: \'dcaegen2-analytics-tca\'\n application_config: {}\n docker_config: {}\n image:\n get_input: tag_version\n log_info:\n log_directory: \"/opt/app/TCAnalytics/logs\"\n application_config:\n app_config:\n appDescription: DCAE Analytics Threshold Crossing Alert Application\n appName: dcae-tca\n tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n tcaVESAlertsTableName: TCAVESAlertsTable\n tcaVESAlertsTableTTLSeconds: \'1728000\'\n tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n tcaVESMessageStatusTableTTLSeconds: \'86400\'\n thresholdCalculatorFlowletInstances: \'2\'\n app_preferences:\n aaiEnrichmentHost:\n get_input: aaiEnrichmentHost\n aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n aaiEnrichmentPortNumber: \'8443\'\n aaiEnrichmentProtocol: https\n aaiEnrichmentUserName: dcae@dcae.onap.org\n aaiEnrichmentUserPassword: demo123456!\n aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n enableAAIEnrichment:\n get_input: enableAAIEnrichment\n enableRedisCaching:\n get_input: enableRedisCaching\n redisHosts:\n get_input: redisHosts\n enableAlertCEFFormat: \'false\'\n publisherContentType: application/json\n publisherHostName:\n get_input: dmaap_host\n publisherHostPort:\n get_input: dmaap_port\n publisherMaxBatchSize: \'1\'\n publisherMaxRecoveryQueueSize: \'100000\'\n publisherPollingInterval: \'20000\'\n publisherProtocol: http\n publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n subscriberConsumerGroup: OpenDCAE-clamp\n subscriberConsumerId: c12\n subscriberContentType: application/json\n subscriberHostName:\n get_input: dmaap_host\n subscriberHostPort:\n get_input: dmaap_port\n subscriberMessageLimit: \'-1\'\n subscriberPollingInterval: \'30000\'\n subscriberProtocol: http\n subscriberTimeoutMS: \'-1\'\n subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n# tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n service_component_type: dcaegen2-analytics_tca\n interfaces:\n cloudify.interfaces.lifecycle:\n start:\n inputs:\n envs:\n DMAAPHOST:\n { get_input: dmaap_host }\n DMAAPPORT:\n { get_input: dmaap_port }\n DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n AAIHOST:\n { get_input: aaiEnrichmentHost }\n AAIPORT:\n { get_input: aaiEnrichmentPort }\n CONSUL_HOST:\n { get_input: consul_host }\n CONSUL_PORT:\n { get_input: consul_port }\n CBS_HOST:\n { get_input: cbs_host }\n CBS_PORT:\n { get_input: cbs_port }\n CONFIG_BINDING_SERVICE: \"config_binding_service\"\n ports:\n - concat: [\"11011:\", { get_input: external_port }]\n tca_policy:\n type: clamp.nodes.policy\n properties:\n policy_id:\n get_input: policy_id\n policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-66bade06-cbe6-4b82-ac71-4c74a01fc8aa',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0'); /*!40000 ALTER TABLE `loop_templates` ENABLE KEYS */; UNLOCK TABLES; @@ -152,9 +152,9 @@ UNLOCK TABLES; LOCK TABLES `looptemplates_to_loopelementmodels` WRITE; /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` DISABLE KEYS */; -INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_xektp_v1_0_ResourceInstanceName1_tca',0); -INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_xektp_v1_0_ResourceInstanceName1_tca_3',0); -INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_xektp_v1_0_ResourceInstanceName2_tca_2',0); +INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_U19Qe_v1_0_ResourceInstanceName1_tca',0); +INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_U19Qe_v1_0_ResourceInstanceName1_tca_3',0); +INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_U19Qe_v1_0_ResourceInstanceName2_tca_2',0); /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` ENABLE KEYS */; UNLOCK TABLES; @@ -182,13 +182,12 @@ UNLOCK TABLES; LOCK TABLES `policy_models` WRITE; /*!40000 ALTER TABLE `policy_models` DISABLE KEYS */; -INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.Blacklist','1.0.0','Not found','2020-08-03 15:21:52.164440','Not found','2020-08-03 15:21:52.327023','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n onap.policies.controlloop.guard.Common:\n derived_from: tosca.policies.Root\n version: 1.0.0\n description: |\n This is the base Policy Type for Guard policies that guard the execution of Operational\n Policies.\n properties:\n actor:\n type: string\n description: Specifies the Actor the guard applies to.\n required: true\n operation:\n type: string\n description: Specified the operation that the actor is performing\n the guard applies to.\n required: true\n timeRange:\n type: tosca.datatypes.TimeInterval\n description: |\n An optional range of time during the day the guard policy is valid for.\n required: false\n id:\n type: string\n description: The Control Loop id this applies to.\n required: false\n onap.policies.controlloop.guard.common.Blacklist:\n derived_from: onap.policies.controlloop.guard.Common\n type_version: 1.0.0\n version: 1.0.0\n description: Supports blacklist of entity id\'s from performing control loop\n actions on.\n properties:\n blacklist:\n type: list\n description: List of entity id\'s\n required: true\n entry_schema:\n type: string\n','{\n \"supportedPdpGroups\": [\n {\n \"controlloop\": [\n \"xacml\"\n ]\n }\n ]\n}'); -INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.FrequencyLimiter','1.0.0','Not found','2020-08-03 15:21:52.110465','Not found','2020-08-03 15:21:52.338404','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n onap.policies.controlloop.guard.Common:\n derived_from: tosca.policies.Root\n version: 1.0.0\n description: |\n This is the base Policy Type for Guard policies that guard the execution of Operational\n Policies.\n properties:\n actor:\n type: string\n description: Specifies the Actor the guard applies to.\n required: true\n operation:\n type: string\n description: Specified the operation that the actor is performing\n the guard applies to.\n required: true\n timeRange:\n type: tosca.datatypes.TimeInterval\n description: |\n An optional range of time during the day the guard policy is valid for.\n required: false\n id:\n type: string\n description: The Control Loop id this applies to.\n required: false\n onap.policies.controlloop.guard.common.FrequencyLimiter:\n derived_from: onap.policies.controlloop.guard.Common\n type_version: 1.0.0\n version: 1.0.0\n description: Supports limiting the frequency of actions being taken by a Actor.\n properties:\n timeWindow:\n type: integer\n description: The time window to count the actions against.\n required: true\n timeUnits:\n type: string\n description: The units of time the window is counting.\n constraints:\n - valid_values:\n - second\n - minute\n - hour\n - day\n - week\n - month\n - year\n limit:\n type: integer\n description: The limit\n required: true\n constraints:\n - greater_than: 0\n','{\n \"supportedPdpGroups\": [\n {\n \"controlloop\": [\n \"xacml\"\n ]\n }\n ]\n}'); -INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.MinMax','2.0.0','Not found','2020-08-03 15:21:52.208290','Not found','2020-08-03 15:21:52.208290','MinMax','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n onap.policies.controlloop.guard.Common:\n derived_from: tosca.policies.Root\n version: 1.0.0\n description: |\n This is the base Policy Type for Guard policies that guard the execution of Operational\n Policies.\n properties:\n actor:\n type: string\n description: Specifies the Actor the guard applies to.\n required: true\n operation:\n type: string\n description: Specified the operation that the actor is performing\n the guard applies to.\n required: true\n timeRange:\n type: tosca.datatypes.TimeInterval\n description: |\n An optional range of time during the day the guard policy is valid for.\n required: false\n id:\n type: string\n description: The Control Loop id this applies to.\n required: false\n onap.policies.controlloop.guard.common.MinMax:\n derived_from: onap.policies.controlloop.guard.Common\n type_version: 1.0.0\n version: 1.0.0\n description: Supports Min/Max number of entity for scaling operations\n properties:\n min:\n type: integer\n required: true\n description: The minimum instances of this entity\n max:\n type: integer\n required: false\n description: The maximum instances of this entity\n',NULL); -INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Operational','1.0.0','Not found','2020-08-03 15:21:17.644583','Not found','2020-08-03 15:21:52.348204','OperationalPolicyLegacy','','{\n \"supportedPdpGroups\": [\n {\n \"controlloop\": [\n \"apex\",\n \"drools\"\n ]\n }\n ]\n}'); -INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Apex','1.0.0','Not found','2020-08-03 15:21:52.034695','Not found','2020-08-03 15:21:52.360000','Apex','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n onap.policies.controlloop.operational.Common:\n properties:\n abatement:\n name: abatement\n type: boolean\n typeVersion: 0.0.0\n description: Whether an abatement event message will be expected for\n the control loop from DCAE.\n default: \'false\'\n required: true\n constraints: [\n ]\n metadata: {\n }\n operations:\n name: operations\n type: list\n typeVersion: 0.0.0\n description: List of operations to be performed when Control Loop\n is triggered.\n required: true\n constraints: [\n ]\n entry_schema:\n type: onap.datatype.controlloop.Operation\n typeVersion: 0.0.0\n constraints: [\n ]\n metadata: {\n }\n trigger:\n name: trigger\n type: string\n typeVersion: 0.0.0\n description: Initial operation to execute upon receiving an Onset\n event message for the Control Loop.\n required: true\n constraints: [\n ]\n metadata: {\n }\n timeout:\n name: timeout\n type: integer\n typeVersion: 0.0.0\n description: |\n Overall timeout for executing all the operations. This timeout should equal or exceed the total\n timeout for each operation listed.\n required: true\n constraints: [\n ]\n metadata: {\n }\n id:\n name: id\n type: string\n typeVersion: 0.0.0\n description: The unique control loop id.\n required: true\n constraints: [\n ]\n metadata: {\n }\n name: onap.policies.controlloop.operational.Common\n version: 1.0.0\n derived_from: tosca.policies.Root\n metadata: {\n }\n description: |\n Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n Policy Types. This does NOT support the legacy Policy YAML policy type.\n onap.policies.controlloop.operational.common.Apex:\n properties:\n engineServiceParameters:\n name: engineServiceParameters\n type: string\n typeVersion: 0.0.0\n description: The engine parameters like name, instanceCount, policy\n implementation, parameters etc.\n required: true\n constraints: [\n ]\n metadata: {\n }\n eventOutputParameters:\n name: eventOutputParameters\n type: string\n typeVersion: 0.0.0\n description: The event output parameters.\n required: true\n constraints: [\n ]\n metadata: {\n }\n javaProperties:\n name: javaProperties\n type: string\n typeVersion: 0.0.0\n description: Name/value pairs of properties to be set for APEX if\n needed.\n required: false\n constraints: [\n ]\n metadata: {\n }\n eventInputParameters:\n name: eventInputParameters\n type: string\n typeVersion: 0.0.0\n description: The event input parameters.\n required: true\n constraints: [\n ]\n metadata: {\n }\n name: onap.policies.controlloop.operational.common.Apex\n version: 1.0.0\n derived_from: onap.policies.controlloop.operational.Common\n metadata: {\n }\n description: Operational policies for Apex PDP\ndata_types:\n onap.datatype.controlloop.Actor:\n constraints: [\n ]\n properties:\n payload:\n name: payload\n type: map\n typeVersion: 0.0.0\n description: Name/value pairs of payload information passed by Policy\n to the actor\n required: false\n constraints: [\n ]\n entry_schema:\n type: string\n typeVersion: 0.0.0\n constraints: [\n ]\n metadata:\n clamp_possible_values: ClampExecution:CDS/payload\n target:\n name: target\n type: onap.datatype.controlloop.Target\n typeVersion: 0.0.0\n description: The resource the operation should be performed on.\n required: true\n constraints: [\n ]\n metadata: {\n }\n actor:\n name: actor\n type: string\n typeVersion: 0.0.0\n description: The actor performing the operation.\n required: true\n constraints: [\n ]\n metadata:\n clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor\n operation:\n name: operation\n type: string\n typeVersion: 0.0.0\n description: The operation the actor is performing.\n required: true\n constraints: [\n ]\n metadata:\n clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operation\n name: onap.datatype.controlloop.Actor\n version: 0.0.0\n derived_from: tosca.datatypes.Root\n metadata: {\n }\n description: An actor/operation/target definition\n onap.datatype.controlloop.Operation:\n constraints: [\n ]\n properties:\n failure_retries:\n name: failure_retries\n type: string\n typeVersion: 0.0.0\n description: Points to the operation to invoke when the current operation\n has exceeded its max retries.\n default: final_failure_retries\n required: false\n constraints: [\n ]\n metadata: {\n }\n id:\n name: id\n type: string\n typeVersion: 0.0.0\n description: Unique identifier for the operation\n required: true\n constraints: [\n ]\n metadata: {\n }\n failure_timeout:\n name: failure_timeout\n type: string\n typeVersion: 0.0.0\n description: Points to the operation to invoke when the time out for\n the operation occurs.\n default: final_failure_timeout\n required: false\n constraints: [\n ]\n metadata: {\n }\n failure:\n name: failure\n type: string\n typeVersion: 0.0.0\n description: Points to the operation to invoke on Actor operation\n failure.\n default: final_failure\n required: false\n constraints: [\n ]\n metadata: {\n }\n operation:\n name: operation\n type: onap.datatype.controlloop.Actor\n typeVersion: 0.0.0\n description: The definition of the operation to be performed.\n required: true\n constraints: [\n ]\n metadata: {\n }\n failure_guard:\n name: failure_guard\n type: string\n typeVersion: 0.0.0\n description: Points to the operation to invoke when the current operation\n is blocked due to guard policy enforcement.\n default: final_failure_guard\n required: false\n constraints: [\n ]\n metadata: {\n }\n retries:\n name: retries\n type: integer\n typeVersion: 0.0.0\n description: The number of retries the actor should attempt to perform\n the operation.\n default: \'0\'\n required: true\n constraints: [\n ]\n metadata: {\n }\n timeout:\n name: timeout\n type: integer\n typeVersion: 0.0.0\n description: The amount of time for the actor to perform the operation.\n required: true\n constraints: [\n ]\n metadata: {\n }\n failure_exception:\n name: failure_exception\n type: string\n typeVersion: 0.0.0\n description: Points to the operation to invoke when the current operation\n causes an exception.\n default: final_failure_exception\n required: false\n constraints: [\n ]\n metadata: {\n }\n description:\n name: description\n type: string\n typeVersion: 0.0.0\n description: A user-friendly description of the intent for the operation\n required: false\n constraints: [\n ]\n metadata: {\n }\n success:\n name: success\n type: string\n typeVersion: 0.0.0\n description: Points to the operation to invoke on success. A value\n of \"final_success\" indicates and end to the operation.\n default: final_success\n required: false\n constraints: [\n ]\n metadata: {\n }\n name: onap.datatype.controlloop.Operation\n version: 0.0.0\n derived_from: tosca.datatypes.Root\n metadata: {\n }\n description: An operation supported by an actor\n onap.datatype.controlloop.Target:\n constraints: [\n ]\n properties:\n entityIds:\n name: entityIds\n type: map\n typeVersion: 0.0.0\n description: |\n Map of values that identify the resource. If none are provided, it is assumed that the\n entity that generated the ONSET event will be the target.\n required: false\n constraints: [\n ]\n entry_schema:\n type: string\n typeVersion: 0.0.0\n constraints: [\n ]\n metadata:\n clamp_possible_values: ClampExecution:CSAR_RESOURCES\n targetType:\n name: targetType\n type: string\n typeVersion: 0.0.0\n description: Category for the target type\n required: true\n constraints:\n - valid_values:\n - VNF\n - VM\n - VFMODULE\n - PNF\n metadata: {\n }\n name: onap.datatype.controlloop.Target\n version: 0.0.0\n derived_from: tosca.datatypes.Root\n metadata: {\n }\n description: Definition for a entity in A&AI to perform a control loop operation\n on\nname: ToscaServiceTemplateSimple\nversion: 1.0.0\nmetadata: {\n }\n','{\n \"supportedPdpGroups\": [\n {\n \"controlloop\": [\n \"drools\"\n ]\n }\n ]\n}'); -INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Drools','1.0.0','Not found','2020-08-03 15:21:51.857883','Not found','2020-08-03 15:21:52.370263','Drools','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n onap.policies.controlloop.operational.common.Drools:\n derived_from: onap.policies.controlloop.operational.Common\n type_version: 1.0.0\n version: 1.0.0\n description: Operational policies for Drools PDP\n properties:\n controllerName:\n type: string\n description: Drools controller properties\n required: false\n onap.policies.controlloop.operational.Common:\n derived_from: tosca.policies.Root\n version: 1.0.0\n description: |\n Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n Policy Types. This does NOT support the legacy Policy YAML policy type.\n properties:\n id:\n type: string\n description: The unique control loop id.\n required: true\n timeout:\n type: integer\n description: |\n Overall timeout for executing all the operations. This timeout should equal or exceed the total\n timeout for each operation listed.\n required: true\n abatement:\n type: boolean\n description: Whether an abatement event message will be expected for\n the control loop from DCAE.\n required: true\n default: false\n trigger:\n type: string\n description: Initial operation to execute upon receiving an Onset\n event message for the Control Loop.\n required: true\n operations:\n type: list\n description: List of operations to be performed when Control Loop\n is triggered.\n required: true\n entry_schema:\n type: onap.datatype.controlloop.Operation\ndata_types:\n onap.datatype.controlloop.Target:\n derived_from: tosca.datatypes.Root\n description: Definition for a entity in A&AI to perform a control loop operation\n on\n properties:\n targetType:\n type: string\n description: Category for the target type\n required: true\n constraints:\n - valid_values:\n - VNF\n - VM\n - VFMODULE\n - PNF\n entityIds:\n type: map\n description: |\n Map of values that identify the resource. If none are provided, it is assumed that the\n entity that generated the ONSET event will be the target.\n required: false\n metadata:\n clamp_possible_values: ClampExecution:CSAR_RESOURCES\n entry_schema:\n type: string\n onap.datatype.controlloop.Actor:\n derived_from: tosca.datatypes.Root\n description: An actor/operation/target definition\n properties:\n actor:\n type: string\n description: The actor performing the operation.\n required: true\n metadata:\n clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor\n operation:\n type: string\n description: The operation the actor is performing.\n required: true\n metadata:\n clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operations\n target:\n type: onap.datatype.controlloop.Target\n description: The resource the operation should be performed on.\n required: true\n payload:\n type: map\n description: Name/value pairs of payload information passed by Policy\n to the actor\n required: false\n metadata:\n clamp_possible_values: ClampExecution:CDS/payload\n entry_schema:\n type: string\n onap.datatype.controlloop.Operation:\n derived_from: tosca.datatypes.Root\n description: An operation supported by an actor\n properties:\n id:\n type: string\n description: Unique identifier for the operation\n required: true\n description:\n type: string\n description: A user-friendly description of the intent for the operation\n required: false\n operation:\n type: onap.datatype.controlloop.Actor\n description: The definition of the operation to be performed.\n required: true\n timeout:\n type: integer\n description: The amount of time for the actor to perform the operation.\n required: true\n retries:\n type: integer\n description: The number of retries the actor should attempt to perform\n the operation.\n required: true\n default: 0\n success:\n type: string\n description: Points to the operation to invoke on success. A value\n of \"final_success\" indicates and end to the operation.\n required: false\n default: final_success\n failure:\n type: string\n description: Points to the operation to invoke on Actor operation\n failure.\n required: false\n default: final_failure\n failure_timeout:\n type: string\n description: Points to the operation to invoke when the time out for\n the operation occurs.\n required: false\n default: final_failure_timeout\n failure_retries:\n type: string\n description: Points to the operation to invoke when the current operation\n has exceeded its max retries.\n required: false\n default: final_failure_retries\n failure_exception:\n type: string\n description: Points to the operation to invoke when the current operation\n causes an exception.\n required: false\n default: final_failure_exception\n failure_guard:\n type: string\n description: Points to the operation to invoke when the current operation\n is blocked due to guard policy enforcement.\n required: false\n default: final_failure_guard\n','{\n \"supportedPdpGroups\": [\n {\n \"controlloop\": [\n \"drools\"\n ]\n }\n ]\n}'); -INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-08-03 15:21:32.844607','Not found','2020-08-03 15:21:52.383500','app','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n onap.policies.Monitoring:\n derived_from: tosca.policies.Root\n version: 1.0.0\n description: a base policy type for all policies that govern monitoring provisioning\n onap.policies.monitoring.cdap.tca.hi.lo.app:\n derived_from: onap.policies.Monitoring\n version: 1.0.0\n properties:\n tca_policy:\n type: onap.datatypes.monitoring.tca_policy\n description: TCA Policy JSON\n required: true\ndata_types:\n onap.datatypes.monitoring.metricsPerEventName:\n derived_from: tosca.datatypes.Root\n properties:\n controlLoopSchemaType:\n type: string\n required: true\n description: Specifies Control Loop Schema Type for the event Name\n e.g. VNF, VM\n constraints:\n - valid_values:\n - VM\n - VNF\n eventName:\n type: string\n required: true\n description: Event name to which thresholds need to be applied\n policyName:\n type: string\n required: true\n description: TCA Policy Scope Name\n policyScope:\n type: string\n required: true\n description: TCA Policy Scope\n policyVersion:\n type: string\n required: true\n description: TCA Policy Scope Version\n thresholds:\n type: list\n required: true\n description: Thresholds associated with eventName\n entry_schema:\n type: onap.datatypes.monitoring.thresholds\n onap.datatypes.monitoring.tca_policy:\n derived_from: tosca.datatypes.Root\n properties:\n domain:\n type: string\n required: true\n description: Domain name to which TCA needs to be applied\n default: measurementsForVfScaling\n constraints:\n - equal: measurementsForVfScaling\n metricsPerEventName:\n type: list\n required: true\n description: Contains eventName and threshold details that need to\n be applied to given eventName\n entry_schema:\n type: onap.datatypes.monitoring.metricsPerEventName\n onap.datatypes.monitoring.thresholds:\n derived_from: tosca.datatypes.Root\n properties:\n closedLoopControlName:\n type: string\n required: true\n description: Closed Loop Control Name associated with the threshold\n closedLoopEventStatus:\n type: string\n required: true\n description: Closed Loop Event Status of the threshold\n constraints:\n - valid_values:\n - ONSET\n - ABATED\n direction:\n type: string\n required: true\n description: Direction of the threshold\n constraints:\n - valid_values:\n - LESS\n - LESS_OR_EQUAL\n - GREATER\n - GREATER_OR_EQUAL\n - EQUAL\n fieldPath:\n type: string\n required: true\n description: Json field Path as per CEF message which needs to be\n analyzed for TCA\n constraints:\n - valid_values:\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n - $.event.measurementsForVfScalingFields.meanRequestLatency\n - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n severity:\n type: string\n required: true\n description: Threshold Event Severity\n constraints:\n - valid_values:\n - CRITICAL\n - MAJOR\n - MINOR\n - WARNING\n - NORMAL\n thresholdValue:\n type: integer\n required: true\n description: Threshold value for the field Path inside CEF message\n version:\n type: string\n required: true\n description: Version number associated with the threshold\n','{\n \"supportedPdpGroups\": [\n {\n \"monitoring\": [\n \"xacml\"\n ]\n }\n ]\n}'); +INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.Blacklist','1.0.0','Not found','2020-10-09 17:11:33.689766','Not found','2020-10-09 17:11:34.010869','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n onap.policies.controlloop.guard.Common:\n derived_from: tosca.policies.Root\n version: 1.0.0\n description: |\n This is the base Policy Type for Guard policies that guard the execution of Operational\n Policies.\n properties:\n actor:\n type: string\n description: Specifies the Actor the guard applies to.\n required: true\n operation:\n type: string\n description: Specified the operation that the actor is performing\n the guard applies to.\n required: true\n timeRange:\n type: tosca.datatypes.TimeInterval\n description: |\n An optional range of time during the day the guard policy is valid for.\n required: false\n id:\n type: string\n description: The Control Loop id this applies to.\n required: false\n onap.policies.controlloop.guard.common.Blacklist:\n derived_from: onap.policies.controlloop.guard.Common\n type_version: 1.0.0\n version: 1.0.0\n description: Supports blacklist of entity id\'s from performing control loop\n actions on.\n properties:\n blacklist:\n type: list\n description: List of entity id\'s\n required: true\n entry_schema:\n type: string\n','{\n \"supportedPdpGroups\": [\n {\n \"controlloop\": [\n \"xacml\"\n ]\n }\n ]\n}'); +INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.FrequencyLimiter','1.0.0','Not found','2020-10-09 17:11:33.627436','Not found','2020-10-09 17:11:34.033593','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n onap.policies.controlloop.guard.Common:\n derived_from: tosca.policies.Root\n version: 1.0.0\n description: |\n This is the base Policy Type for Guard policies that guard the execution of Operational\n Policies.\n properties:\n actor:\n type: string\n description: Specifies the Actor the guard applies to.\n required: true\n operation:\n type: string\n description: Specified the operation that the actor is performing\n the guard applies to.\n required: true\n timeRange:\n type: tosca.datatypes.TimeInterval\n description: |\n An optional range of time during the day the guard policy is valid for.\n required: false\n id:\n type: string\n description: The Control Loop id this applies to.\n required: false\n onap.policies.controlloop.guard.common.FrequencyLimiter:\n derived_from: onap.policies.controlloop.guard.Common\n type_version: 1.0.0\n version: 1.0.0\n description: Supports limiting the frequency of actions being taken by a Actor.\n properties:\n timeWindow:\n type: integer\n description: The time window to count the actions against.\n required: true\n timeUnits:\n type: string\n description: The units of time the window is counting.\n constraints:\n - valid_values:\n - second\n - minute\n - hour\n - day\n - week\n - month\n - year\n limit:\n type: integer\n description: The limit\n required: true\n constraints:\n - greater_than: 0\n','{\n \"supportedPdpGroups\": [\n {\n \"controlloop\": [\n \"xacml\"\n ]\n }\n ]\n}'); +INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.MinMax','2.0.0','Not found','2020-10-09 17:11:33.773212','Not found','2020-10-09 17:11:33.773212','MinMax','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n onap.policies.controlloop.guard.Common:\n derived_from: tosca.policies.Root\n version: 1.0.0\n description: |\n This is the base Policy Type for Guard policies that guard the execution of Operational\n Policies.\n properties:\n actor:\n type: string\n description: Specifies the Actor the guard applies to.\n required: true\n operation:\n type: string\n description: Specified the operation that the actor is performing\n the guard applies to.\n required: true\n timeRange:\n type: tosca.datatypes.TimeInterval\n description: |\n An optional range of time during the day the guard policy is valid for.\n required: false\n id:\n type: string\n description: The Control Loop id this applies to.\n required: false\n onap.policies.controlloop.guard.common.MinMax:\n derived_from: onap.policies.controlloop.guard.Common\n type_version: 1.0.0\n version: 1.0.0\n description: Supports Min/Max number of entity for scaling operations\n properties:\n min:\n type: integer\n required: true\n description: The minimum instances of this entity\n max:\n type: integer\n required: false\n description: The maximum instances of this entity\n',NULL); +INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Apex','1.0.0','Not found','2020-10-09 17:11:33.562107','Not found','2020-10-09 17:11:34.058644','Apex','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n onap.policies.controlloop.operational.Common:\n properties:\n abatement:\n name: abatement\n type: boolean\n typeVersion: 0.0.0\n description: Whether an abatement event message will be expected for\n the control loop from DCAE.\n default: \'false\'\n required: true\n constraints: [\n ]\n metadata: {\n }\n operations:\n name: operations\n type: list\n typeVersion: 0.0.0\n description: List of operations to be performed when Control Loop\n is triggered.\n required: true\n constraints: [\n ]\n entry_schema:\n type: onap.datatype.controlloop.Operation\n typeVersion: 0.0.0\n constraints: [\n ]\n metadata: {\n }\n trigger:\n name: trigger\n type: string\n typeVersion: 0.0.0\n description: Initial operation to execute upon receiving an Onset\n event message for the Control Loop.\n required: true\n constraints: [\n ]\n metadata: {\n }\n timeout:\n name: timeout\n type: integer\n typeVersion: 0.0.0\n description: |\n Overall timeout for executing all the operations. This timeout should equal or exceed the total\n timeout for each operation listed.\n required: true\n constraints: [\n ]\n metadata: {\n }\n id:\n name: id\n type: string\n typeVersion: 0.0.0\n description: The unique control loop id.\n required: true\n constraints: [\n ]\n metadata: {\n }\n name: onap.policies.controlloop.operational.Common\n version: 1.0.0\n derived_from: tosca.policies.Root\n metadata: {\n }\n description: |\n Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n Policy Types. This does NOT support the legacy Policy YAML policy type.\n onap.policies.controlloop.operational.common.Apex:\n properties:\n engineServiceParameters:\n name: engineServiceParameters\n type: string\n typeVersion: 0.0.0\n description: The engine parameters like name, instanceCount, policy\n implementation, parameters etc.\n required: true\n constraints: [\n ]\n metadata: {\n }\n eventOutputParameters:\n name: eventOutputParameters\n type: string\n typeVersion: 0.0.0\n description: The event output parameters.\n required: true\n constraints: [\n ]\n metadata: {\n }\n javaProperties:\n name: javaProperties\n type: string\n typeVersion: 0.0.0\n description: Name/value pairs of properties to be set for APEX if\n needed.\n required: false\n constraints: [\n ]\n metadata: {\n }\n eventInputParameters:\n name: eventInputParameters\n type: string\n typeVersion: 0.0.0\n description: The event input parameters.\n required: true\n constraints: [\n ]\n metadata: {\n }\n name: onap.policies.controlloop.operational.common.Apex\n version: 1.0.0\n derived_from: onap.policies.controlloop.operational.Common\n metadata: {\n }\n description: Operational policies for Apex PDP\ndata_types:\n onap.datatype.controlloop.Actor:\n constraints: [\n ]\n properties:\n payload:\n name: payload\n type: map\n typeVersion: 0.0.0\n description: Name/value pairs of payload information passed by Policy\n to the actor\n required: false\n constraints: [\n ]\n entry_schema:\n type: string\n typeVersion: 0.0.0\n constraints: [\n ]\n metadata:\n clamp_possible_values: ClampExecution:CDS/payload\n target:\n name: target\n type: onap.datatype.controlloop.Target\n typeVersion: 0.0.0\n description: The resource the operation should be performed on.\n required: true\n constraints: [\n ]\n metadata: {\n }\n actor:\n name: actor\n type: string\n typeVersion: 0.0.0\n description: The actor performing the operation.\n required: true\n constraints: [\n ]\n metadata:\n clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor\n operation:\n name: operation\n type: string\n typeVersion: 0.0.0\n description: The operation the actor is performing.\n required: true\n constraints: [\n ]\n metadata:\n clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operation\n name: onap.datatype.controlloop.Actor\n version: 0.0.0\n derived_from: tosca.datatypes.Root\n metadata: {\n }\n description: An actor/operation/target definition\n onap.datatype.controlloop.Operation:\n constraints: [\n ]\n properties:\n failure_retries:\n name: failure_retries\n type: string\n typeVersion: 0.0.0\n description: Points to the operation to invoke when the current operation\n has exceeded its max retries.\n default: final_failure_retries\n required: false\n constraints: [\n ]\n metadata: {\n }\n id:\n name: id\n type: string\n typeVersion: 0.0.0\n description: Unique identifier for the operation\n required: true\n constraints: [\n ]\n metadata: {\n }\n failure_timeout:\n name: failure_timeout\n type: string\n typeVersion: 0.0.0\n description: Points to the operation to invoke when the time out for\n the operation occurs.\n default: final_failure_timeout\n required: false\n constraints: [\n ]\n metadata: {\n }\n failure:\n name: failure\n type: string\n typeVersion: 0.0.0\n description: Points to the operation to invoke on Actor operation\n failure.\n default: final_failure\n required: false\n constraints: [\n ]\n metadata: {\n }\n operation:\n name: operation\n type: onap.datatype.controlloop.Actor\n typeVersion: 0.0.0\n description: The definition of the operation to be performed.\n required: true\n constraints: [\n ]\n metadata: {\n }\n failure_guard:\n name: failure_guard\n type: string\n typeVersion: 0.0.0\n description: Points to the operation to invoke when the current operation\n is blocked due to guard policy enforcement.\n default: final_failure_guard\n required: false\n constraints: [\n ]\n metadata: {\n }\n retries:\n name: retries\n type: integer\n typeVersion: 0.0.0\n description: The number of retries the actor should attempt to perform\n the operation.\n default: \'0\'\n required: true\n constraints: [\n ]\n metadata: {\n }\n timeout:\n name: timeout\n type: integer\n typeVersion: 0.0.0\n description: The amount of time for the actor to perform the operation.\n required: true\n constraints: [\n ]\n metadata: {\n }\n failure_exception:\n name: failure_exception\n type: string\n typeVersion: 0.0.0\n description: Points to the operation to invoke when the current operation\n causes an exception.\n default: final_failure_exception\n required: false\n constraints: [\n ]\n metadata: {\n }\n description:\n name: description\n type: string\n typeVersion: 0.0.0\n description: A user-friendly description of the intent for the operation\n required: false\n constraints: [\n ]\n metadata: {\n }\n success:\n name: success\n type: string\n typeVersion: 0.0.0\n description: Points to the operation to invoke on success. A value\n of \"final_success\" indicates and end to the operation.\n default: final_success\n required: false\n constraints: [\n ]\n metadata: {\n }\n name: onap.datatype.controlloop.Operation\n version: 0.0.0\n derived_from: tosca.datatypes.Root\n metadata: {\n }\n description: An operation supported by an actor\n onap.datatype.controlloop.Target:\n constraints: [\n ]\n properties:\n entityIds:\n name: entityIds\n type: map\n typeVersion: 0.0.0\n description: |\n Map of values that identify the resource. If none are provided, it is assumed that the\n entity that generated the ONSET event will be the target.\n required: false\n constraints: [\n ]\n entry_schema:\n type: string\n typeVersion: 0.0.0\n constraints: [\n ]\n metadata:\n clamp_possible_values: ClampExecution:CSAR_RESOURCES\n targetType:\n name: targetType\n type: string\n typeVersion: 0.0.0\n description: Category for the target type\n required: true\n constraints:\n - valid_values:\n - VNF\n - VM\n - VFMODULE\n - PNF\n metadata: {\n }\n name: onap.datatype.controlloop.Target\n version: 0.0.0\n derived_from: tosca.datatypes.Root\n metadata: {\n }\n description: Definition for a entity in A&AI to perform a control loop operation\n on\nname: ToscaServiceTemplateSimple\nversion: 1.0.0\nmetadata: {\n }\n','{\n \"supportedPdpGroups\": [\n {\n \"controlloop\": [\n \"drools\"\n ]\n }\n ]\n}'); +INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Drools','1.0.0','Not found','2020-10-09 17:11:33.405456','Not found','2020-10-09 17:11:34.097298','Drools','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n onap.policies.controlloop.operational.common.Drools:\n derived_from: onap.policies.controlloop.operational.Common\n type_version: 1.0.0\n version: 1.0.0\n description: Operational policies for Drools PDP\n properties:\n controllerName:\n type: string\n description: Drools controller properties\n required: false\n onap.policies.controlloop.operational.Common:\n derived_from: tosca.policies.Root\n version: 1.0.0\n description: |\n Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n Policy Types. This does NOT support the legacy Policy YAML policy type.\n properties:\n id:\n type: string\n description: The unique control loop id.\n required: true\n timeout:\n type: integer\n description: |\n Overall timeout for executing all the operations. This timeout should equal or exceed the total\n timeout for each operation listed.\n required: true\n abatement:\n type: boolean\n description: Whether an abatement event message will be expected for\n the control loop from DCAE.\n required: true\n default: false\n trigger:\n type: string\n description: Initial operation to execute upon receiving an Onset\n event message for the Control Loop.\n required: true\n operations:\n type: list\n description: List of operations to be performed when Control Loop\n is triggered.\n required: true\n entry_schema:\n type: onap.datatype.controlloop.Operation\ndata_types:\n onap.datatype.controlloop.Target:\n derived_from: tosca.datatypes.Root\n description: Definition for a entity in A&AI to perform a control loop operation\n on\n properties:\n targetType:\n type: string\n description: Category for the target type\n required: true\n constraints:\n - valid_values:\n - VNF\n - VM\n - VFMODULE\n - PNF\n entityIds:\n type: map\n description: |\n Map of values that identify the resource. If none are provided, it is assumed that the\n entity that generated the ONSET event will be the target.\n required: false\n metadata:\n clamp_possible_values: ClampExecution:CSAR_RESOURCES\n entry_schema:\n type: string\n onap.datatype.controlloop.Actor:\n derived_from: tosca.datatypes.Root\n description: An actor/operation/target definition\n properties:\n actor:\n type: string\n description: The actor performing the operation.\n required: true\n metadata:\n clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor\n operation:\n type: string\n description: The operation the actor is performing.\n required: true\n metadata:\n clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operations\n target:\n type: onap.datatype.controlloop.Target\n description: The resource the operation should be performed on.\n required: true\n payload:\n type: map\n description: Name/value pairs of payload information passed by Policy\n to the actor\n required: false\n metadata:\n clamp_possible_values: ClampExecution:CDS/payload\n entry_schema:\n type: string\n onap.datatype.controlloop.Operation:\n derived_from: tosca.datatypes.Root\n description: An operation supported by an actor\n properties:\n id:\n type: string\n description: Unique identifier for the operation\n required: true\n description:\n type: string\n description: A user-friendly description of the intent for the operation\n required: false\n operation:\n type: onap.datatype.controlloop.Actor\n description: The definition of the operation to be performed.\n required: true\n timeout:\n type: integer\n description: The amount of time for the actor to perform the operation.\n required: true\n retries:\n type: integer\n description: The number of retries the actor should attempt to perform\n the operation.\n required: true\n default: 0\n success:\n type: string\n description: Points to the operation to invoke on success. A value\n of \"final_success\" indicates and end to the operation.\n required: false\n default: final_success\n failure:\n type: string\n description: Points to the operation to invoke on Actor operation\n failure.\n required: false\n default: final_failure\n failure_timeout:\n type: string\n description: Points to the operation to invoke when the time out for\n the operation occurs.\n required: false\n default: final_failure_timeout\n failure_retries:\n type: string\n description: Points to the operation to invoke when the current operation\n has exceeded its max retries.\n required: false\n default: final_failure_retries\n failure_exception:\n type: string\n description: Points to the operation to invoke when the current operation\n causes an exception.\n required: false\n default: final_failure_exception\n failure_guard:\n type: string\n description: Points to the operation to invoke when the current operation\n is blocked due to guard policy enforcement.\n required: false\n default: final_failure_guard\n','{\n \"supportedPdpGroups\": [\n {\n \"controlloop\": [\n \"drools\"\n ]\n }\n ]\n}'); +INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-10-09 17:11:38.086948','Not found','2020-10-09 17:11:38.086948','app','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n onap.policies.Monitoring:\n derived_from: tosca.policies.Root\n version: 1.0.0\n description: a base policy type for all policies that govern monitoring provisioning\n onap.policies.monitoring.cdap.tca.hi.lo.app:\n derived_from: onap.policies.Monitoring\n version: 1.0.0\n properties:\n tca_policy:\n type: onap.datatypes.monitoring.tca_policy\n description: TCA Policy JSON\n required: true\ndata_types:\n onap.datatypes.monitoring.metricsPerEventName:\n derived_from: tosca.datatypes.Root\n properties:\n controlLoopSchemaType:\n type: string\n required: true\n description: Specifies Control Loop Schema Type for the event Name\n e.g. VNF, VM\n constraints:\n - valid_values:\n - VM\n - VNF\n eventName:\n type: string\n required: true\n description: Event name to which thresholds need to be applied\n policyName:\n type: string\n required: true\n description: TCA Policy Scope Name\n policyScope:\n type: string\n required: true\n description: TCA Policy Scope\n policyVersion:\n type: string\n required: true\n description: TCA Policy Scope Version\n thresholds:\n type: list\n required: true\n description: Thresholds associated with eventName\n entry_schema:\n type: onap.datatypes.monitoring.thresholds\n onap.datatypes.monitoring.tca_policy:\n derived_from: tosca.datatypes.Root\n properties:\n domain:\n type: string\n required: true\n description: Domain name to which TCA needs to be applied\n default: measurementsForVfScaling\n constraints:\n - equal: measurementsForVfScaling\n metricsPerEventName:\n type: list\n required: true\n description: Contains eventName and threshold details that need to\n be applied to given eventName\n entry_schema:\n type: onap.datatypes.monitoring.metricsPerEventName\n onap.datatypes.monitoring.thresholds:\n derived_from: tosca.datatypes.Root\n properties:\n closedLoopControlName:\n type: string\n required: true\n description: Closed Loop Control Name associated with the threshold\n closedLoopEventStatus:\n type: string\n required: true\n description: Closed Loop Event Status of the threshold\n constraints:\n - valid_values:\n - ONSET\n - ABATED\n direction:\n type: string\n required: true\n description: Direction of the threshold\n constraints:\n - valid_values:\n - LESS\n - LESS_OR_EQUAL\n - GREATER\n - GREATER_OR_EQUAL\n - EQUAL\n fieldPath:\n type: string\n required: true\n description: Json field Path as per CEF message which needs to be\n analyzed for TCA\n constraints:\n - valid_values:\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n - $.event.measurementsForVfScalingFields.meanRequestLatency\n - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n severity:\n type: string\n required: true\n description: Threshold Event Severity\n constraints:\n - valid_values:\n - CRITICAL\n - MAJOR\n - MINOR\n - WARNING\n - NORMAL\n thresholdValue:\n type: integer\n required: true\n description: Threshold value for the field Path inside CEF message\n version:\n type: string\n required: true\n description: Version number associated with the threshold\n',NULL); /*!40000 ALTER TABLE `policy_models` ENABLE KEYS */; UNLOCK TABLES; @@ -198,7 +197,7 @@ UNLOCK TABLES; LOCK TABLES `services` WRITE; /*!40000 ALTER TABLE `services` DISABLE KEYS */; -INSERT INTO `services` VALUES ('63cac700-ab9a-4115-a74f-7eac85e3fce0','vLoadBalancerMS','{\n \"CP\": {},\n \"VL\": {},\n \"VF\": {\n \"vLoadBalancerMS 0\": {\n \"resourceVendor\": \"Test\",\n \"name\": \"vLoadBalancerMS\",\n \"resourceVendorModelNumber\": \"\",\n \"description\": \"vLBMS\",\n \"invariantUUID\": \"1a31b9f2-e50d-43b7-89b3-a040250cf506\",\n \"UUID\": \"b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6\",\n \"type\": \"VF\",\n \"category\": \"Application L4+\",\n \"subcategory\": \"Load Balancer\",\n \"version\": \"1.0\",\n \"customizationUUID\": \"465246dc-7748-45f4-a013-308d92922552\",\n \"resourceVendorRelease\": \"1.0\",\n \"controllerProperties\": {\n \"sdnc_model_name\": \"baseconfiguration\",\n \"sdnc_model_version\": \"1.0.0\",\n \"workflows\": {\n \"resource-assignment\": {\n \"inputs\": {\n \"resource-assignment-properties\": {\n \"request-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"service-instance-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"vnf-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"action-name\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"scope-type\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"hostname\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"vnf_name\": {\n \"required\": true,\n \"type\": \"string\"\n }\n }\n }\n },\n \"activate\": {\n \"inputs\": {\n \"resource-assignment-properties\": {\n \"request-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"service-instance-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"vnf-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"action-name\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"scope-type\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"hostname\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"vnf_name\": {\n \"required\": true,\n \"type\": \"string\"\n }\n }\n }\n },\n \"activate-restconf\": {\n \"inputs\": {\n \"resource-assignment-properties\": {\n \"request-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"service-instance-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"vnf-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"action-name\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"scope-type\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"hostname\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"vnf_name\": {\n \"required\": true,\n \"type\": \"string\"\n }\n }\n }\n },\n \"activate-cli\": {\n \"inputs\": {\n \"resource-assignment-properties\": {\n \"request-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"service-instance-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"vnf-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"action-name\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"scope-type\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"hostname\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"vnf_name\": {\n \"required\": true,\n \"type\": \"string\"\n }\n }\n }\n },\n \"assign-activate\": {\n \"inputs\": {\n \"resource-assignment-properties\": {\n \"request-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"service-instance-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"vnf-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"action-name\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"scope-type\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"hostname\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"vnf_name\": {\n \"required\": true,\n \"type\": \"string\"\n }\n }\n }\n },\n \"imperative-test-wf\": {\n \"inputs\": {\n \"resource-assignment-properties\": {\n \"request-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"service-instance-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"vnf-id\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"action-name\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"scope-type\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"hostname\": {\n \"required\": true,\n \"type\": \"string\"\n },\n \"vnf_name\": {\n \"required\": true,\n \"type\": \"string\"\n }\n }\n }\n }\n }\n }\n }\n },\n \"CR\": {},\n \"VFC\": {},\n \"PNF\": {},\n \"Service\": {},\n \"CVFC\": {},\n \"Service Proxy\": {},\n \"Configuration\": {},\n \"AllottedResource\": {},\n \"VFModule\": {\n \"Vloadbalancerms..vpkg..module-1\": {\n \"vfModuleModelInvariantUUID\": \"ca052563-eb92-4b5b-ad41-9111768ce043\",\n \"vfModuleModelVersion\": \"1\",\n \"vfModuleModelName\": \"Vloadbalancerms..vpkg..module-1\",\n \"vfModuleModelUUID\": \"1e725ccc-b823-4f67-82b9-4f4367070dbc\",\n \"vfModuleModelCustomizationUUID\": \"1bffdc31-a37d-4dee-b65c-dde623a76e52\",\n \"min_vf_module_instances\": 0,\n \"vf_module_label\": \"vpkg\",\n \"max_vf_module_instances\": 1,\n \"vf_module_type\": \"Expansion\",\n \"isBase\": false,\n \"initial_count\": 0,\n \"volume_group\": false\n },\n \"Vloadbalancerms..vdns..module-3\": {\n \"vfModuleModelInvariantUUID\": \"4c10ba9b-f88f-415e-9de3-5d33336047fa\",\n \"vfModuleModelVersion\": \"1\",\n \"vfModuleModelName\": \"Vloadbalancerms..vdns..module-3\",\n \"vfModuleModelUUID\": \"4fa73b49-8a6c-493e-816b-eb401567b720\",\n \"vfModuleModelCustomizationUUID\": \"bafcdab0-801d-4d81-9ead-f464640a38b1\",\n \"min_vf_module_instances\": 0,\n \"vf_module_label\": \"vdns\",\n \"max_vf_module_instances\": 50,\n \"vf_module_type\": \"Expansion\",\n \"isBase\": false,\n \"initial_count\": 0,\n \"volume_group\": false\n },\n \"Vloadbalancerms..base_template..module-0\": {\n \"vfModuleModelInvariantUUID\": \"921f7c96-ebdd-42e6-81b9-1cfc0c9796f3\",\n \"vfModuleModelVersion\": \"1\",\n \"vfModuleModelName\": \"Vloadbalancerms..base_template..module-0\",\n \"vfModuleModelUUID\": \"63734409-f745-4e4d-a38b-131638a0edce\",\n \"vfModuleModelCustomizationUUID\": \"86baddea-c730-4fb8-9410-cd2e17fd7f27\",\n \"min_vf_module_instances\": 1,\n \"vf_module_label\": \"base_template\",\n \"max_vf_module_instances\": 1,\n \"vf_module_type\": \"Base\",\n \"isBase\": true,\n \"initial_count\": 1,\n \"volume_group\": false\n },\n \"Vloadbalancerms..vlb..module-2\": {\n \"vfModuleModelInvariantUUID\": \"a772a1f4-0064-412c-833d-4749b15828dd\",\n \"vfModuleModelVersion\": \"1\",\n \"vfModuleModelName\": \"Vloadbalancerms..vlb..module-2\",\n \"vfModuleModelUUID\": \"0f5c3f6a-650a-4303-abb6-fff3e573a07a\",\n \"vfModuleModelCustomizationUUID\": \"96a78aad-4ffb-4ef0-9c4f-deb03bf1d806\",\n \"min_vf_module_instances\": 0,\n \"vf_module_label\": \"vlb\",\n \"max_vf_module_instances\": 1,\n \"vf_module_type\": \"Expansion\",\n \"isBase\": false,\n \"initial_count\": 0,\n \"volume_group\": false\n }\n }\n}','{\n \"serviceType\": \"\",\n \"serviceRole\": \"\",\n \"description\": \"vLBMS\",\n \"type\": \"Service\",\n \"instantiationType\": \"A-la-carte\",\n \"namingPolicy\": \"\",\n \"serviceEcompNaming\": \"true\",\n \"environmentContext\": \"General_Revenue-Bearing\",\n \"name\": \"vLoadBalancerMS\",\n \"invariantUUID\": \"30ec5b59-4799-48d8-ac5f-1058a6b0e48f\",\n \"ecompGeneratedNaming\": \"true\",\n \"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fce0\",\n \"category\": \"Network L4+\"\n}','1.0'); +INSERT INTO `services` VALUES ('63cac700-ab9a-4115-a74f-7eac85e3fce0','vLoadBalancerMS','{\n \"CP\": {},\n \"VL\": {},\n \"VF\": {\n \"vLoadBalancerMS 0\": {\n \"resourceVendor\": \"Test\",\n \"name\": \"vLoadBalancerMS\",\n \"resourceVendorModelNumber\": \"\",\n \"description\": \"vLBMS\",\n \"invariantUUID\": \"1a31b9f2-e50d-43b7-89b3-a040250cf506\",\n \"UUID\": \"b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6\",\n \"type\": \"VF\",\n \"category\": \"Application L4+\",\n \"subcategory\": \"Load Balancer\",\n \"version\": \"1.0\",\n \"customizationUUID\": \"465246dc-7748-45f4-a013-308d92922552\",\n \"resourceVendorRelease\": \"1.0\",\n \"controllerProperties\": {\n \"sdnc_model_name\": \"baseconfiguration\",\n \"sdnc_model_version\": \"1.0.0\",\n \"workflows\": {\n \"resource-assignment\": {\n \"inputs\": {\n \"resource-assignment-properties\": {\n \"type\": \"object\",\n \"properties\": {\n \"request-id\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"service-instance-id\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"hostname\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"request-info\": {\n \"type\": \"object\",\n \"properties\": {\n \"prop1\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"prop2\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n }\n }\n }\n }\n }\n }\n },\n \"activate\": {\n \"inputs\": {\n \"resource-assignment-properties\": {\n \"type\": \"object\",\n \"properties\": {\n \"request-id\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"service-instance-id\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"hostname\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"request-info\": {\n \"type\": \"object\",\n \"properties\": {\n \"prop1\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"prop2\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n }\n }\n }\n }\n }\n }\n },\n \"activate-restconf\": {\n \"inputs\": {\n \"resource-assignment-properties\": {\n \"type\": \"object\",\n \"properties\": {\n \"request-id\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"service-instance-id\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"hostname\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"request-info\": {\n \"type\": \"object\",\n \"properties\": {\n \"prop1\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"prop2\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n }\n }\n }\n }\n }\n }\n },\n \"activate-cli\": {\n \"inputs\": {\n \"resource-assignment-properties\": {\n \"type\": \"object\",\n \"properties\": {\n \"request-id\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"service-instance-id\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"hostname\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"request-info\": {\n \"type\": \"object\",\n \"properties\": {\n \"prop1\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"prop2\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n }\n }\n }\n }\n }\n }\n },\n \"assign-activate\": {\n \"inputs\": {\n \"resource-assignment-properties\": {\n \"type\": \"object\",\n \"properties\": {\n \"request-id\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"service-instance-id\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"hostname\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"request-info\": {\n \"type\": \"object\",\n \"properties\": {\n \"prop1\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"prop2\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n }\n }\n }\n }\n }\n }\n },\n \"imperative-test-wf\": {\n \"inputs\": {\n \"resource-assignment-properties\": {\n \"type\": \"object\",\n \"properties\": {\n \"request-id\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"service-instance-id\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"hostname\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"request-info\": {\n \"type\": \"object\",\n \"properties\": {\n \"prop1\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n },\n \"prop2\": {\n \"required\": true,\n \"type\": \"string\",\n \"input-param\": true\n }\n }\n }\n }\n }\n }\n }\n }\n }\n }\n },\n \"CR\": {},\n \"VFC\": {},\n \"PNF\": {},\n \"Service\": {},\n \"CVFC\": {},\n \"Service Proxy\": {},\n \"Configuration\": {},\n \"AllottedResource\": {},\n \"VFModule\": {\n \"Vloadbalancerms..vpkg..module-1\": {\n \"vfModuleModelInvariantUUID\": \"ca052563-eb92-4b5b-ad41-9111768ce043\",\n \"vfModuleModelVersion\": \"1\",\n \"vfModuleModelName\": \"Vloadbalancerms..vpkg..module-1\",\n \"vfModuleModelUUID\": \"1e725ccc-b823-4f67-82b9-4f4367070dbc\",\n \"vfModuleModelCustomizationUUID\": \"1bffdc31-a37d-4dee-b65c-dde623a76e52\",\n \"min_vf_module_instances\": 0,\n \"vf_module_label\": \"vpkg\",\n \"max_vf_module_instances\": 1,\n \"vf_module_type\": \"Expansion\",\n \"isBase\": false,\n \"initial_count\": 0,\n \"volume_group\": false\n },\n \"Vloadbalancerms..vdns..module-3\": {\n \"vfModuleModelInvariantUUID\": \"4c10ba9b-f88f-415e-9de3-5d33336047fa\",\n \"vfModuleModelVersion\": \"1\",\n \"vfModuleModelName\": \"Vloadbalancerms..vdns..module-3\",\n \"vfModuleModelUUID\": \"4fa73b49-8a6c-493e-816b-eb401567b720\",\n \"vfModuleModelCustomizationUUID\": \"bafcdab0-801d-4d81-9ead-f464640a38b1\",\n \"min_vf_module_instances\": 0,\n \"vf_module_label\": \"vdns\",\n \"max_vf_module_instances\": 50,\n \"vf_module_type\": \"Expansion\",\n \"isBase\": false,\n \"initial_count\": 0,\n \"volume_group\": false\n },\n \"Vloadbalancerms..base_template..module-0\": {\n \"vfModuleModelInvariantUUID\": \"921f7c96-ebdd-42e6-81b9-1cfc0c9796f3\",\n \"vfModuleModelVersion\": \"1\",\n \"vfModuleModelName\": \"Vloadbalancerms..base_template..module-0\",\n \"vfModuleModelUUID\": \"63734409-f745-4e4d-a38b-131638a0edce\",\n \"vfModuleModelCustomizationUUID\": \"86baddea-c730-4fb8-9410-cd2e17fd7f27\",\n \"min_vf_module_instances\": 1,\n \"vf_module_label\": \"base_template\",\n \"max_vf_module_instances\": 1,\n \"vf_module_type\": \"Base\",\n \"isBase\": true,\n \"initial_count\": 1,\n \"volume_group\": false\n },\n \"Vloadbalancerms..vlb..module-2\": {\n \"vfModuleModelInvariantUUID\": \"a772a1f4-0064-412c-833d-4749b15828dd\",\n \"vfModuleModelVersion\": \"1\",\n \"vfModuleModelName\": \"Vloadbalancerms..vlb..module-2\",\n \"vfModuleModelUUID\": \"0f5c3f6a-650a-4303-abb6-fff3e573a07a\",\n \"vfModuleModelCustomizationUUID\": \"96a78aad-4ffb-4ef0-9c4f-deb03bf1d806\",\n \"min_vf_module_instances\": 0,\n \"vf_module_label\": \"vlb\",\n \"max_vf_module_instances\": 1,\n \"vf_module_type\": \"Expansion\",\n \"isBase\": false,\n \"initial_count\": 0,\n \"volume_group\": false\n }\n }\n}','{\n \"serviceType\": \"\",\n \"serviceRole\": \"\",\n \"description\": \"vLBMS\",\n \"type\": \"Service\",\n \"instantiationType\": \"A-la-carte\",\n \"namingPolicy\": \"\",\n \"serviceEcompNaming\": \"true\",\n \"environmentContext\": \"General_Revenue-Bearing\",\n \"name\": \"vLoadBalancerMS\",\n \"invariantUUID\": \"30ec5b59-4799-48d8-ac5f-1058a6b0e48f\",\n \"ecompGeneratedNaming\": \"true\",\n \"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fce0\",\n \"category\": \"Network L4+\"\n}','1.0'); /*!40000 ALTER TABLE `services` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -210,4 +209,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-08-03 13:23:55 +-- Dump completed on 2020-10-09 15:12:32 diff --git a/pom.xml b/pom.xml index d3f885c6c..a2d66621a 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 1.0.0 2.25.2 - 2.2.9.RELEASE + 2.2.10.RELEASE jacoco ${project.build.directory}/surefire-reports @@ -469,7 +469,7 @@ org.onap.sdc.sdc-distribution-client sdc-distribution-client - 1.3.0 + 1.4.1 org.onap.sdc.sdc-tosca diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html index 96f5b9ca7..6f6156c32 100644 --- a/src/main/resources/META-INF/resources/swagger.html +++ b/src/main/resources/META-INF/resources/swagger.html @@ -444,31 +444,31 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
  • 2. Paths
      -
    • 2.1. GET /v1/healthcheck +
    • 2.1. GET /v1/healthcheck
      • -
    • 2.2. GET /v1/user/getUser +
    • 2.2. GET /v1/user/getUser
      • -
    • 2.3. GET /v2/clampInformation +
    • 2.3. GET /v2/clampInformation
      • -
    • 2.4. GET /v2/dictionary +
    • 2.4. GET /v2/dictionary
      • -
    • 2.5. PUT /v2/dictionary +
    • 2.5. PUT /v2/dictionary
      • -
    • 2.6. GET /v2/dictionary/secondary/names +
    • 2.6. GET /v2/dictionary/secondary/names
      • -
    • 2.7. GET /v2/dictionary/{dictionaryName} +
    • 2.7. GET /v2/dictionary/{dictionaryName}
      • -
    • 2.8. PUT /v2/dictionary/{name} +
    • 2.8. PUT /v2/dictionary/{name}
      • -
    • 2.9. DELETE /v2/dictionary/{name} +
    • 2.9. DELETE /v2/dictionary/{name}
      • -
    • 2.10. DELETE /v2/dictionary/{name}/elements/{shortName} +
    • 2.10. DELETE /v2/dictionary/{name}/elements/{shortName}
      • -
    • 2.11. PUT /v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion} +
    • 2.11. PUT /v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}
      • -
    • 2.12. POST /v2/loop/create/{loopName}?templateName={templateName} +
    • 2.12. POST /v2/loop/create/{loopName}?templateName={templateName}
      • -
    • 2.13. PUT /v2/loop/delete/{loopName} +
    • 2.13. PUT /v2/loop/delete/{loopName}
      • -
    • 2.14. PUT /v2/loop/deploy/{loopName} +
    • 2.14. PUT /v2/loop/deploy/{loopName}
      • -
    • 2.15. GET /v2/loop/getAllNames +
    • 2.15. GET /v2/loop/getAllNames
      • -
    • 2.16. GET /v2/loop/getstatus/{loopName} +
    • 2.16. GET /v2/loop/getstatus/{loopName}
      • -
    • 2.17. PUT /v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName} +
    • 2.17. PUT /v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}
      • -
    • 2.18. PUT /v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName} +
    • 2.18. PUT /v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}
      • -
    • 2.19. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName} +
    • 2.19. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}
      • -
    • 2.20. PUT /v2/loop/restart/{loopName} +
    • 2.20. PUT /v2/loop/restart/{loopName}
      • -
    • 2.21. PUT /v2/loop/stop/{loopName} +
    • 2.21. PUT /v2/loop/stop/{loopName}
      • -
    • 2.22. PUT /v2/loop/submit/{loopName} +
    • 2.22. PUT /v2/loop/submit/{loopName}
      • -
    • 2.23. PUT /v2/loop/undeploy/{loopName} +
    • 2.23. PUT /v2/loop/undeploy/{loopName}
      • -
    • 2.24. POST /v2/loop/updateGlobalProperties/{loopName} +
    • 2.24. POST /v2/loop/updateGlobalProperties/{loopName}
      • -
    • 2.25. POST /v2/loop/updateMicroservicePolicy/{loopName} +
    • 2.25. POST /v2/loop/updateMicroservicePolicy/{loopName}
      • -
    • 2.26. POST /v2/loop/updateOperationalPolicies/{loopName} +
    • 2.26. POST /v2/loop/updateOperationalPolicies/{loopName}
      • -
    • 2.27. GET /v2/loop/{loopName} +
    • 2.27. GET /v2/loop/{loopName}
      • -
    • 2.28. POST /v2/policyToscaModels +
    • 2.28. POST /v2/policyToscaModels
      • -
    • 2.29. GET /v2/policyToscaModels +
    • 2.29. GET /v2/policyToscaModels
      • -
    • 2.30. GET /v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion} +
    • 2.30. GET /v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}
      • -
    • 2.31. GET /v2/policyToscaModels/{policyModelType}/{policyModelVersion} +
    • 2.31. GET /v2/policyToscaModels/{policyModelType}/{policyModelVersion}
      • -
    • 2.32. PUT /v2/policyToscaModels/{policyModelType}/{policyModelVersion} +
    • 2.32. PUT /v2/policyToscaModels/{policyModelType}/{policyModelVersion}
      • -
    • 2.33. GET /v2/templates +
    • 2.33. GET /v2/templates
      • -
    • 2.34. GET /v2/templates/names +
    • 2.34. GET /v2/templates/names
      • -
    • 2.35. GET /v2/templates/{templateName} +
    • 2.35. GET /v2/templates/{templateName}
      • 2.35.1. Parameters
      • 2.35.2. Responses
        • @@ -723,13 +723,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b

        1.1. Version information

        -

        Version : 5.1.0-SNAPSHOT

        +

        Version : 5.1.3-SNAPSHOT

        1.2. URI scheme

        -

        Host : localhost:43065
        +

        Host : localhost:8443
        BasePath : /restservices/clds/
        Schemes : HTTP

        @@ -740,7 +740,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b

        2. Paths

        -

        2.1. GET /v1/healthcheck

        +

        2.1. GET /v1/healthcheck

        2.1.1. Responses

        @@ -777,7 +777,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.2. GET /v1/user/getUser

        +

        2.2. GET /v1/user/getUser

        2.2.1. Responses

        @@ -811,7 +811,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.3. GET /v2/clampInformation

        +

        2.3. GET /v2/clampInformation

        2.3.1. Responses

        @@ -848,7 +848,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.4. GET /v2/dictionary

        +

        2.4. GET /v2/dictionary

        2.4.1. Responses

        @@ -885,7 +885,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.5. PUT /v2/dictionary

        +

        2.5. PUT /v2/dictionary

        2.5.1. Parameters

        @@ -957,7 +957,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.6. GET /v2/dictionary/secondary/names

        +

        2.6. GET /v2/dictionary/secondary/names

        2.6.1. Responses

        @@ -994,7 +994,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.7. GET /v2/dictionary/{dictionaryName}

        +

        2.7. GET /v2/dictionary/{dictionaryName}

        2.7.1. Parameters

        @@ -1056,7 +1056,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.8. PUT /v2/dictionary/{name}

        +

        2.8. PUT /v2/dictionary/{name}

        2.8.1. Parameters

        @@ -1134,7 +1134,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.9. DELETE /v2/dictionary/{name}

        +

        2.9. DELETE /v2/dictionary/{name}

        2.9.1. Parameters

        @@ -1193,7 +1193,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.10. DELETE /v2/dictionary/{name}/elements/{shortName}

        +

        2.10. DELETE /v2/dictionary/{name}/elements/{shortName}

        2.10.1. Parameters

        @@ -1258,7 +1258,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.11. PUT /v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}

        +

        2.11. PUT /v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}

        2.11.1. Parameters

        @@ -1332,7 +1332,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.12. POST /v2/loop/create/{loopName}?templateName={templateName}

        +

        2.12. POST /v2/loop/create/{loopName}?templateName={templateName}

        2.12.1. Parameters

        @@ -1404,7 +1404,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.13. PUT /v2/loop/delete/{loopName}

        +

        2.13. PUT /v2/loop/delete/{loopName}

        2.13.1. Parameters

        @@ -1453,7 +1453,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.14. PUT /v2/loop/deploy/{loopName}

        +

        2.14. PUT /v2/loop/deploy/{loopName}

        2.14.1. Parameters

        @@ -1515,7 +1515,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.15. GET /v2/loop/getAllNames

        +

        2.15. GET /v2/loop/getAllNames

        2.15.1. Responses

        @@ -1552,7 +1552,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.16. GET /v2/loop/getstatus/{loopName}

        +

        2.16. GET /v2/loop/getstatus/{loopName}

        2.16.1. Parameters

        @@ -1614,7 +1614,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.17. PUT /v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}

        +

        2.17. PUT /v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}

        2.17.1. Parameters

        @@ -1682,7 +1682,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.18. PUT /v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}

        +

        2.18. PUT /v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}

        2.18.1. Parameters

        @@ -1750,7 +1750,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.19. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}

        +

        2.19. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}

        2.19.1. Parameters

        @@ -1830,7 +1830,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.20. PUT /v2/loop/restart/{loopName}

        +

        2.20. PUT /v2/loop/restart/{loopName}

        2.20.1. Parameters

        @@ -1892,7 +1892,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.21. PUT /v2/loop/stop/{loopName}

        +

        2.21. PUT /v2/loop/stop/{loopName}

        2.21.1. Parameters

        @@ -1954,7 +1954,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.22. PUT /v2/loop/submit/{loopName}

        +

        2.22. PUT /v2/loop/submit/{loopName}

        2.22.1. Parameters

        @@ -2016,7 +2016,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.23. PUT /v2/loop/undeploy/{loopName}

        +

        2.23. PUT /v2/loop/undeploy/{loopName}

        2.23.1. Parameters

        @@ -2078,7 +2078,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.24. POST /v2/loop/updateGlobalProperties/{loopName}

        +

        2.24. POST /v2/loop/updateGlobalProperties/{loopName}

        2.24.1. Parameters

        @@ -2156,7 +2156,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.25. POST /v2/loop/updateMicroservicePolicy/{loopName}

        +

        2.25. POST /v2/loop/updateMicroservicePolicy/{loopName}

        2.25.1. Parameters

        @@ -2234,7 +2234,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.26. POST /v2/loop/updateOperationalPolicies/{loopName}

        +

        2.26. POST /v2/loop/updateOperationalPolicies/{loopName}

        2.26.1. Parameters

        @@ -2312,7 +2312,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.27. GET /v2/loop/{loopName}

        +

        2.27. GET /v2/loop/{loopName}

        2.27.1. Parameters

        @@ -2374,7 +2374,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.28. POST /v2/policyToscaModels

        +

        2.28. POST /v2/policyToscaModels

        2.28.1. Parameters

        @@ -2446,7 +2446,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.29. GET /v2/policyToscaModels

        +

        2.29. GET /v2/policyToscaModels

        2.29.1. Responses

        @@ -2483,7 +2483,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.30. GET /v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}

        +

        2.30. GET /v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}

        2.30.1. Parameters

        @@ -2551,7 +2551,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.31. GET /v2/policyToscaModels/{policyModelType}/{policyModelVersion}

        +

        2.31. GET /v2/policyToscaModels/{policyModelType}/{policyModelVersion}

        2.31.1. Parameters

        @@ -2619,7 +2619,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.32. PUT /v2/policyToscaModels/{policyModelType}/{policyModelVersion}

        +

        2.32. PUT /v2/policyToscaModels/{policyModelType}/{policyModelVersion}

        2.32.1. Parameters

        @@ -2703,7 +2703,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.33. GET /v2/templates

        +

        2.33. GET /v2/templates

        2.33.1. Responses

        @@ -2740,7 +2740,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.34. GET /v2/templates/names

        +

        2.34. GET /v2/templates/names

        2.34.1. Responses

        @@ -2777,7 +2777,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
        -

        2.35. GET /v2/templates/{templateName}

        +

        2.35. GET /v2/templates/{templateName}

        2.35.1. Parameters

        @@ -3953,11 +3953,6 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b - - - - @@ -4046,11 +4041,6 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b - - - - @@ -4207,7 +4197,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b diff --git a/src/main/resources/clds/camel/routes/cds-flows.xml b/src/main/resources/clds/camel/routes/cds-flows.xml index 9946c990b..0e56970c2 100644 --- a/src/main/resources/clds/camel/routes/cds-flows.xml +++ b/src/main/resources/clds/camel/routes/cds-flows.xml @@ -13,7 +13,7 @@ - + java.lang.Exception @@ -44,7 +44,7 @@ - + java.lang.Exception diff --git a/src/main/resources/clds/camel/routes/dcae-flows.xml b/src/main/resources/clds/camel/routes/dcae-flows.xml index d71db1763..65849e9ae 100644 --- a/src/main/resources/clds/camel/routes/dcae-flows.xml +++ b/src/main/resources/clds/camel/routes/dcae-flows.xml @@ -1,477 +1,491 @@ - - - - - ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true - - - - - ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false - - - - - - - - - - - - ${exchangeProperty[loopObject].getMicroServicePolicies()} - - - ${body} - - - - false - - - - - - - - - PUT - - - application/json - - - ${exchangeProperty[X-ONAP-RequestID]} - - - - ${exchangeProperty[X-ONAP-InvocationID]} - - - - ${exchangeProperty[X-ONAP-PartnerName]} - - - - - - - - - - - - - - - - java.lang.Exception - - false - - - DEPLOY micro service failed - (MicroService name:${exchangeProperty[microServicePolicy].getName()}), - Dep-id:${exchangeProperty[dcaeDeploymentId]}, - StatusUrl:${exchangeProperty[dcaeStatusUrl]}) - - - - DCAE - - - - - - - - - - - - - - - - - - - - - - PUT - - - application/json - - - ${exchangeProperty[X-ONAP-RequestID]} - - - - ${exchangeProperty[X-ONAP-InvocationID]} - - - - ${exchangeProperty[X-ONAP-PartnerName]} - - - - - - - - - + + + + + ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true + + + + + ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false + + + + + + + + + + + + ${exchangeProperty[loopObject].getMicroServicePolicies()} + + + ${body} + + + + false + + + + + + + + + PUT + + + application/json + + + ${exchangeProperty[X-ONAP-RequestID]} + + + + ${exchangeProperty[X-ONAP-InvocationID]} + + + + ${exchangeProperty[X-ONAP-PartnerName]} + + + + + + + + + + + + + + + + java.lang.Exception + + false + + + DEPLOY micro service failed + (MicroService name:${exchangeProperty[microServicePolicy].getName()}), + Dep-id:${exchangeProperty[dcaeDeploymentId]}, + StatusUrl:${exchangeProperty[dcaeStatusUrl]}) + + + + DCAE + + + + + + + + + + + + + + + + + + + + + + PUT + + + application/json + + + ${exchangeProperty[X-ONAP-RequestID]} + + + + ${exchangeProperty[X-ONAP-InvocationID]} + + + + ${exchangeProperty[X-ONAP-PartnerName]} + + + + + + + + - - - - - - - - - DEPLOY loop status - (Dep-id:${exchangeProperty[dcaeDeploymentId]}, - StatusUrl:${exchangeProperty[dcaeStatusUrl]}) - - - - DCAE - - - - - - - - - - ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true - - - - - ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false - - - - - - - - - - - - ${exchangeProperty[loopObject].getMicroServicePolicies()} - - - ${body} - - - - - ${exchangeProperty[microServicePolicy].getDcaeDeploymentId()} != null - - - - - - DELETE - - - application/json - - - ${exchangeProperty[X-ONAP-RequestID]} - - - - ${exchangeProperty[X-ONAP-InvocationID]} - - - - ${exchangeProperty[X-ONAP-PartnerName]} - - - - - - - - - - - - - - - - - - - - - - java.lang.Exception - - false - - - UNDEPLOY micro service failed - (MicroService name:${exchangeProperty[microServicePolicy].getName()}) - - - - DCAE - - - - - - - - - - - - - - - - ${exchangeProperty[loopObject].getDcaeDeploymentId()} - != null - - - - - - - DELETE - - - application/json - - - ${exchangeProperty[X-ONAP-RequestID]} - - - - ${exchangeProperty[X-ONAP-InvocationID]} - - - - ${exchangeProperty[X-ONAP-PartnerName]} - - - - - - - - - - - - - - - - - UNDEPLOY loop status - - - DCAE - - - - - - - - - - - - - - - - - - GET - - - ${exchangeProperty[X-ONAP-RequestID]} - - - - ${exchangeProperty[X-ONAP-InvocationID]} - - - - ${exchangeProperty[X-ONAP-PartnerName]} - - - - - - java.lang.Exception - - true - + + + + + + + + + DEPLOY loop status + (Dep-id:${exchangeProperty[dcaeDeploymentId]}, + StatusUrl:${exchangeProperty[dcaeStatusUrl]}) + + + + DCAE + + + + + + + + + + ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true + + + + + ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false + + + + + + + + + + + + ${exchangeProperty[loopObject].getMicroServicePolicies()} + + + ${body} + + + + + ${exchangeProperty[microServicePolicy].getDcaeDeploymentId()} != null + + + + + + DELETE + + + application/json + + + ${exchangeProperty[X-ONAP-RequestID]} + + + + ${exchangeProperty[X-ONAP-InvocationID]} + + + + ${exchangeProperty[X-ONAP-PartnerName]} + + + + + + + + + + + + + + + + + + + + + + java.lang.Exception + + false + + + UNDEPLOY micro service failed + (MicroService name:${exchangeProperty[microServicePolicy].getName()}) + + + + DCAE + + + + + + + + + + + + + + + + ${exchangeProperty[loopObject].getDcaeDeploymentId()} + != null + + + + + + + DELETE + + + application/json + - - - - - - - - DCAE deployment status - - - DCAE - - - - - - - - - - - - GET - - - ${exchangeProperty[X-ONAP-RequestID]} - - - - ${exchangeProperty[X-ONAP-InvocationID]} - - - - ${exchangeProperty[X-ONAP-PartnerName]} - - - - - - - - - - + + ${exchangeProperty[X-ONAP-RequestID]} + + + + ${exchangeProperty[X-ONAP-InvocationID]} + + + + ${exchangeProperty[X-ONAP-PartnerName]} + + + + + + + + + + + + + + + + + UNDEPLOY loop status + + + DCAE + + + + + + + + + + + + + + + + + + GET + + + ${exchangeProperty[X-ONAP-RequestID]} + + + + ${exchangeProperty[X-ONAP-InvocationID]} + + + + ${exchangeProperty[X-ONAP-PartnerName]} + + + + + + ${exchangeProperty[getStatusUrl].contains("?")} == true + + + & + + + + + ? + + + + + + java.lang.Exception + + true + - - - - - - - - GET - - - ${exchangeProperty[X-ONAP-RequestID]} - - - - ${exchangeProperty[X-ONAP-InvocationID]} - - - - ${exchangeProperty[X-ONAP-PartnerName]} - - - - - - - - - - ${exchangeProperty[dcaeResponseList]} - - - ${body} - - - - - - - - - + + + + + + + + DCAE deployment status + + + DCAE + + + + + + + + + + + + GET + + + ${exchangeProperty[X-ONAP-RequestID]} + + + + ${exchangeProperty[X-ONAP-InvocationID]} + + + + ${exchangeProperty[X-ONAP-PartnerName]} + + + + + + + + + + + + + + + + + + + GET + + + ${exchangeProperty[X-ONAP-RequestID]} + + + + ${exchangeProperty[X-ONAP-InvocationID]} + + + + ${exchangeProperty[X-ONAP-PartnerName]} + + + + + + + + + + ${exchangeProperty[dcaeResponseList]} + + + ${body} + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/src/main/resources/clds/camel/routes/policy-flows.xml index 355aba788..9328ceb00 100644 --- a/src/main/resources/clds/camel/routes/policy-flows.xml +++ b/src/main/resources/clds/camel/routes/policy-flows.xml @@ -55,7 +55,7 @@ + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> java.lang.Exception @@ -109,7 +109,7 @@ + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/policies/deployed/${exchangeProperty[policyName]}/1.0.0?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> java.lang.Exception @@ -161,7 +161,7 @@ + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> @@ -195,7 +195,7 @@ + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelName]}/versions/${exchangeProperty[policyModelVersion]}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> @@ -236,7 +236,7 @@ + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies/${exchangeProperty[policy].getName()}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&deleteWithBody=false&mapHttpMessageBody=false&mapHttpMessageFormUrlEncodedBody=false&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> @@ -336,7 +336,7 @@ + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> @@ -386,7 +386,7 @@ + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> @@ -427,7 +427,7 @@ + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> @@ -464,7 +464,7 @@ + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies/${exchangeProperty[policyName]}/versions/1.0.0?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> ${exchangeProperty[policyName]} PDP Group removal status diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java index b9fcf51aa..504103559 100644 --- a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java +++ b/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java @@ -45,9 +45,9 @@ public class JsonTemplateManagerTest extends TestCase { JsonTemplateManager jsonTemplateManager = new JsonTemplateManager( ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap" - + ".policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0?" - + "connectionTimeToLive=5000/.file"), ResourceFileUtils.getResourceAsString( - "clds/tosca-converter/default-tosca-types.yaml"), + + ".policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file"), + ResourceFileUtils.getResourceAsString( + "clds/tosca-converter/default-tosca-types.yaml"), ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json")); String componentName = "onap.policies.monitoring.cdap.tca.hi.lo.app"; jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null); @@ -63,9 +63,9 @@ public class JsonTemplateManagerTest extends TestCase { JsonTemplateManager jsonTemplateManager = new JsonTemplateManager( ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap" - + ".policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0?" - + "connectionTimeToLive=5000/.file"), ResourceFileUtils.getResourceAsString( - "clds/tosca-converter/default-tosca-types.yaml"), + + ".policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file"), + ResourceFileUtils.getResourceAsString( + "clds/tosca-converter/default-tosca-types.yaml"), ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json")); String componentName = "onap.policies.controlloop.guard.common.FrequencyLimiter"; jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null); @@ -81,9 +81,9 @@ public class JsonTemplateManagerTest extends TestCase { JsonTemplateManager jsonTemplateManager = new JsonTemplateManager( ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap" - + ".policies.controlloop.operational.common.Apex/versions/1.0.0?" - + "connectionTimeToLive=5000/.file"), ResourceFileUtils.getResourceAsString( - "clds/tosca-converter/default-tosca-types.yaml"), + + ".policies.controlloop.operational.common.Apex/versions/1.0.0/.file"), + ResourceFileUtils.getResourceAsString( + "clds/tosca-converter/default-tosca-types.yaml"), ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json")); String componentName = "onap.policies.controlloop.operational.common.Apex"; jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null); @@ -99,9 +99,9 @@ public class JsonTemplateManagerTest extends TestCase { JsonTemplateManager jsonTemplateManager = new JsonTemplateManager( ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap" - + ".policies.controlloop.operational.common.Drools/versions/1.0.0?" - + "connectionTimeToLive=5000/.file"), ResourceFileUtils.getResourceAsString( - "clds/tosca-converter/default-tosca-types.yaml"), + + ".policies.controlloop.operational.common.Drools/versions/1.0.0/.file"), + ResourceFileUtils.getResourceAsString( + "clds/tosca-converter/default-tosca-types.yaml"), ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json")); String componentName = "onap.policies.controlloop.operational.common.Drools"; jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null); diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java index b5b0247c8..1d4ee4311 100644 --- a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java +++ b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java @@ -132,8 +132,7 @@ public class ToscaConverterWithDictionarySupportItCase { JsonTemplateManager jsonTemplateManager = new JsonTemplateManager( ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap" - + ".policies.controlloop.operational.common.Apex/versions/1.0" - + ".0?connectionTimeToLive=5000/.file"), + + ".policies.controlloop.operational.common.Apex/versions/1.0.0/.file"), ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"), ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json")); diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec?connectionTimeToLive=5000/.file deleted file mode 100644 index 9e616dfea..000000000 --- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec?connectionTimeToLive=5000/.file +++ /dev/null @@ -1,96 +0,0 @@ -{ - "blueprintName": "baseconfiguration", - "version": "1.0.0", - "workFlowData": { - "workFlowName": "resource-assignment", - "inputs": { - "resource-assignment-properties": { - "required": true, - "type": "dt-resource-assignment-properties" - } - }, - "outputs": { - "response-property": { - "type": "string", - "value": "executed" - }, - "template-properties": { - "type": "json", - "value": { - "get_attribute": [ - "resource-assignment", - "assignment-params" - ] - } - } - } - }, - "dataTypes": { - "dt-resource-assignment-properties": { - "description": "This is Dynamically generated data type for workflow activate", - "version": "1.0.0", - "metadata": null, - "attributes": null, - "properties": { - "request-id": { - "required": true, - "type": "string", - "input-param": true - }, - "service-instance-id": { - "required": true, - "type": "string", - "input-param": true - }, - "vnf-id": { - "required": true, - "type": "string" - }, - "action-name": { - "required": true, - "type": "string" - }, - "scope-type": { - "required": true, - "type": "string" - }, - "hostname": { - "required": true, - "type": "string", - "input-param": true - }, - "request-info": { - "required": true, - "type": "dt-request-info-properties", - "input-param": true - }, - "vnf_name": { - "required": true, - "type": "string" - } - }, - "constraints": null, - "derived_from": "tosca.datatypes.Dynamic" - }, - "dt-request-info-properties": { - "description": "This is Dynamically generated data type for workflow activate", - "version": "1.0.0", - "metadata": null, - "attributes": null, - "properties": { - "prop1": { - "required": true, - "type": "string", - "input-param": true - }, - "prop2": { - "required": true, - "type": "string", - "input-param": true - } - }, - "constraints": null, - "derived_from": "tosca.datatypes.Dynamic" - } - } -} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec?connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec?connectionTimeToLive=5000/.header deleted file mode 100644 index 6a280d972..000000000 --- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec?connectionTimeToLive=5000/.header +++ /dev/null @@ -1 +0,0 @@ -{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file new file mode 100644 index 000000000..9e616dfea --- /dev/null +++ b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file @@ -0,0 +1,96 @@ +{ + "blueprintName": "baseconfiguration", + "version": "1.0.0", + "workFlowData": { + "workFlowName": "resource-assignment", + "inputs": { + "resource-assignment-properties": { + "required": true, + "type": "dt-resource-assignment-properties" + } + }, + "outputs": { + "response-property": { + "type": "string", + "value": "executed" + }, + "template-properties": { + "type": "json", + "value": { + "get_attribute": [ + "resource-assignment", + "assignment-params" + ] + } + } + } + }, + "dataTypes": { + "dt-resource-assignment-properties": { + "description": "This is Dynamically generated data type for workflow activate", + "version": "1.0.0", + "metadata": null, + "attributes": null, + "properties": { + "request-id": { + "required": true, + "type": "string", + "input-param": true + }, + "service-instance-id": { + "required": true, + "type": "string", + "input-param": true + }, + "vnf-id": { + "required": true, + "type": "string" + }, + "action-name": { + "required": true, + "type": "string" + }, + "scope-type": { + "required": true, + "type": "string" + }, + "hostname": { + "required": true, + "type": "string", + "input-param": true + }, + "request-info": { + "required": true, + "type": "dt-request-info-properties", + "input-param": true + }, + "vnf_name": { + "required": true, + "type": "string" + } + }, + "constraints": null, + "derived_from": "tosca.datatypes.Dynamic" + }, + "dt-request-info-properties": { + "description": "This is Dynamically generated data type for workflow activate", + "version": "1.0.0", + "metadata": null, + "attributes": null, + "properties": { + "prop1": { + "required": true, + "type": "string", + "input-param": true + }, + "prop2": { + "required": true, + "type": "string", + "input-param": true + } + }, + "constraints": null, + "derived_from": "tosca.datatypes.Dynamic" + } + } +} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0?connectionTimeToLive=5000/.file deleted file mode 100644 index 58975d86a..000000000 --- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0?connectionTimeToLive=5000/.file +++ /dev/null @@ -1,12 +0,0 @@ -{ - "blueprintName": "baseconfiguration", - "version": "1.0.0", - "workflows": [ - "resource-assignment", - "activate", - "activate-restconf", - "activate-cli", - "assign-activate", - "imperative-test-wf" - ] -} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0?connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0?connectionTimeToLive=5000/.header deleted file mode 100644 index 6a280d972..000000000 --- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0?connectionTimeToLive=5000/.header +++ /dev/null @@ -1 +0,0 @@ -{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file new file mode 100644 index 000000000..58975d86a --- /dev/null +++ b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file @@ -0,0 +1,12 @@ +{ + "blueprintName": "baseconfiguration", + "version": "1.0.0", + "workflows": [ + "resource-assignment", + "activate", + "activate-restconf", + "activate-cli", + "assign-activate", + "imperative-test-wf" + ] +} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes?connectionTimeToLive=5000/.file deleted file mode 100644 index 7f5b897bf..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes?connectionTimeToLive=5000/.file +++ /dev/null @@ -1,46 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_1_0 -policy_types: - onap.policies.controlloop.operational.common.Drools: - version: 1.0.0 - description: Operational Policy for Control Loops using the Drools PDP - derived_from: onapy.policies.controlloop.Operational - properties: - # Omitted for brevity, see Section 1 - - onap.policies.controlloop.operational.common.Apex: - version: 1.0.0 - description: Operational Policy for Control Loops using the APEX PDP - derived_from: onap.policies.controlloop.Operational - properties: - # Omitted for brevity, see Section 1 - - onap.policies.controlloop.guard.common.FrequencyLimiter: - version: 1.0.0 - description: Supports limiting the frequency of actions being taken by a Actor. - derived_from: onap.policies.controlloop.Guard - properties: - # Omitted for brevity, see Section 1 - - onap.policies.controlloop.guard.common.Blacklist: - version: 1.0.0 - description: Supports blacklist of VNF's from performing control loop actions on. - derived_from: onap.policies.controlloop.Guard - properties: - # Omitted for brevity, see Section 1 - - onap.policies.controlloop.guard.common.MinMax: - version: 1.0.0 - description: Supports Min/Max number of VF Modules - derived_from: onap.policies.controlloop.Guard - properties: - # Omitted for brevity, see Section 1 - - onap.policies.controlloop.guard.common.MinMax: - version: 2.0.0 - description: Supports Min/Max number of VF Modules - derived_from: onap.policies.controlloop.Guard - properties: - # Omitted for brevity, see Section 1 - -data_types: - # Any bespoke data types referenced by policy type definitions[] diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes?connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes?connectionTimeToLive=5000/.header deleted file mode 100644 index 6a280d972..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes?connectionTimeToLive=5000/.header +++ /dev/null @@ -1 +0,0 @@ -{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file new file mode 100644 index 000000000..7f5b897bf --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file @@ -0,0 +1,46 @@ +tosca_definitions_version: tosca_simple_yaml_1_1_0 +policy_types: + onap.policies.controlloop.operational.common.Drools: + version: 1.0.0 + description: Operational Policy for Control Loops using the Drools PDP + derived_from: onapy.policies.controlloop.Operational + properties: + # Omitted for brevity, see Section 1 + + onap.policies.controlloop.operational.common.Apex: + version: 1.0.0 + description: Operational Policy for Control Loops using the APEX PDP + derived_from: onap.policies.controlloop.Operational + properties: + # Omitted for brevity, see Section 1 + + onap.policies.controlloop.guard.common.FrequencyLimiter: + version: 1.0.0 + description: Supports limiting the frequency of actions being taken by a Actor. + derived_from: onap.policies.controlloop.Guard + properties: + # Omitted for brevity, see Section 1 + + onap.policies.controlloop.guard.common.Blacklist: + version: 1.0.0 + description: Supports blacklist of VNF's from performing control loop actions on. + derived_from: onap.policies.controlloop.Guard + properties: + # Omitted for brevity, see Section 1 + + onap.policies.controlloop.guard.common.MinMax: + version: 1.0.0 + description: Supports Min/Max number of VF Modules + derived_from: onap.policies.controlloop.Guard + properties: + # Omitted for brevity, see Section 1 + + onap.policies.controlloop.guard.common.MinMax: + version: 2.0.0 + description: Supports Min/Max number of VF Modules + derived_from: onap.policies.controlloop.Guard + properties: + # Omitted for brevity, see Section 1 + +data_types: + # Any bespoke data types referenced by policy type definitions[] diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0?connectionTimeToLive=5000/.file deleted file mode 100644 index 79e79f0fe..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0?connectionTimeToLive=5000/.file +++ /dev/null @@ -1,38 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_1_0 -policy_types: - onap.policies.controlloop.guard.Common: - derived_from: tosca.policies.Root - version: 1.0.0 - description: | - This is the base Policy Type for Guard policies that guard the execution of Operational - Policies. - properties: - actor: - type: string - description: Specifies the Actor the guard applies to. - required: true - operation: - type: string - description: Specified the operation that the actor is performing the guard applies to. - required: true - timeRange: - type: tosca.datatypes.TimeInterval - description: | - An optional range of time during the day the guard policy is valid for. - required: false - id: - type: string - description: The Control Loop id this applies to. - required: false - onap.policies.controlloop.guard.common.Blacklist: - derived_from: onap.policies.controlloop.guard.Common - type_version: 1.0.0 - version: 1.0.0 - description: Supports blacklist of entity id's from performing control loop actions on. - properties: - blacklist: - type: list - description: List of entity id's - required: true - entry_schema: - type: string \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0?connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0?connectionTimeToLive=5000/.header deleted file mode 100644 index 6a280d972..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0?connectionTimeToLive=5000/.header +++ /dev/null @@ -1 +0,0 @@ -{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file new file mode 100644 index 000000000..79e79f0fe --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file @@ -0,0 +1,38 @@ +tosca_definitions_version: tosca_simple_yaml_1_1_0 +policy_types: + onap.policies.controlloop.guard.Common: + derived_from: tosca.policies.Root + version: 1.0.0 + description: | + This is the base Policy Type for Guard policies that guard the execution of Operational + Policies. + properties: + actor: + type: string + description: Specifies the Actor the guard applies to. + required: true + operation: + type: string + description: Specified the operation that the actor is performing the guard applies to. + required: true + timeRange: + type: tosca.datatypes.TimeInterval + description: | + An optional range of time during the day the guard policy is valid for. + required: false + id: + type: string + description: The Control Loop id this applies to. + required: false + onap.policies.controlloop.guard.common.Blacklist: + derived_from: onap.policies.controlloop.guard.Common + type_version: 1.0.0 + version: 1.0.0 + description: Supports blacklist of entity id's from performing control loop actions on. + properties: + blacklist: + type: list + description: List of entity id's + required: true + entry_schema: + type: string \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0?connectionTimeToLive=5000/.file deleted file mode 100644 index 163027e46..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0?connectionTimeToLive=5000/.file +++ /dev/null @@ -1,47 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_1_0 -policy_types: - onap.policies.controlloop.guard.Common: - derived_from: tosca.policies.Root - version: 1.0.0 - description: | - This is the base Policy Type for Guard policies that guard the execution of Operational - Policies. - properties: - actor: - type: string - description: Specifies the Actor the guard applies to. - required: true - operation: - type: string - description: Specified the operation that the actor is performing the guard applies to. - required: true - timeRange: - type: tosca.datatypes.TimeInterval - description: | - An optional range of time during the day the guard policy is valid for. - required: false - id: - type: string - description: The Control Loop id this applies to. - required: false - onap.policies.controlloop.guard.common.FrequencyLimiter: - derived_from: onap.policies.controlloop.guard.Common - type_version: 1.0.0 - version: 1.0.0 - description: Supports limiting the frequency of actions being taken by a Actor. - properties: - timeWindow: - type: integer - description: The time window to count the actions against. - required: true - timeUnits: - type: string - description: The units of time the window is counting. - constraints: - - valid_values: ["second", "minute", "hour", "day", "week", "month", "year"] - limit: - type: integer - description: The limit - required: true - constraints: - - greater_than: 0 \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0?connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0?connectionTimeToLive=5000/.header deleted file mode 100644 index 6a280d972..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0?connectionTimeToLive=5000/.header +++ /dev/null @@ -1 +0,0 @@ -{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file new file mode 100644 index 000000000..163027e46 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file @@ -0,0 +1,47 @@ +tosca_definitions_version: tosca_simple_yaml_1_1_0 +policy_types: + onap.policies.controlloop.guard.Common: + derived_from: tosca.policies.Root + version: 1.0.0 + description: | + This is the base Policy Type for Guard policies that guard the execution of Operational + Policies. + properties: + actor: + type: string + description: Specifies the Actor the guard applies to. + required: true + operation: + type: string + description: Specified the operation that the actor is performing the guard applies to. + required: true + timeRange: + type: tosca.datatypes.TimeInterval + description: | + An optional range of time during the day the guard policy is valid for. + required: false + id: + type: string + description: The Control Loop id this applies to. + required: false + onap.policies.controlloop.guard.common.FrequencyLimiter: + derived_from: onap.policies.controlloop.guard.Common + type_version: 1.0.0 + version: 1.0.0 + description: Supports limiting the frequency of actions being taken by a Actor. + properties: + timeWindow: + type: integer + description: The time window to count the actions against. + required: true + timeUnits: + type: string + description: The units of time the window is counting. + constraints: + - valid_values: ["second", "minute", "hour", "day", "week", "month", "year"] + limit: + type: integer + description: The limit + required: true + constraints: + - greater_than: 0 \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0?connectionTimeToLive=5000/.file deleted file mode 100644 index 778efae9e..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0?connectionTimeToLive=5000/.file +++ /dev/null @@ -1,80 +0,0 @@ -{ - "tosca_definitions_version": "tosca_simple_yaml_1_1_0", - "policy_types": { - "onap.policies.controlloop.guard.Common": { - "properties": { - "id": { - "name": "id", - "type": "string", - "typeVersion": "0.0.0", - "description": "The Control Loop id this applies to.", - "required": false, - "constraints": [], - "metadata": {} - }, - "actor": { - "name": "actor", - "type": "string", - "typeVersion": "0.0.0", - "description": "Specifies the Actor the guard applies to.", - "required": true, - "constraints": [], - "metadata": {} - }, - "operation": { - "name": "operation", - "type": "string", - "typeVersion": "0.0.0", - "description": "Specified the operation that the actor is performing the guard applies to.", - "required": true, - "constraints": [], - "metadata": {} - }, - "timeRange": { - "name": "timeRange", - "type": "tosca.datatypes.TimeInterval", - "typeVersion": "0.0.0", - "description": "An optional range of time during the day the guard policy is valid for.\n", - "required": false, - "constraints": [], - "metadata": {} - } - }, - "name": "onap.policies.controlloop.guard.Common", - "version": "1.0.0", - "derived_from": "tosca.policies.Root", - "metadata": {}, - "description": "This is the base Policy Type for Guard policies that guard the execution of Operational\nPolicies.\n" - }, - "onap.policies.controlloop.guard.common.MinMax": { - "properties": { - "min": { - "name": "min", - "type": "integer", - "typeVersion": "0.0.0", - "description": "The minimum instances of this entity", - "required": true, - "constraints": [], - "metadata": {} - }, - "max": { - "name": "max", - "type": "integer", - "typeVersion": "0.0.0", - "description": "The maximum instances of this entity", - "required": false, - "constraints": [], - "metadata": {} - } - }, - "name": "onap.policies.controlloop.guard.common.MinMax", - "version": "1.0.0", - "derived_from": "onap.policies.controlloop.guard.Common", - "metadata": {}, - "description": "Supports Min/Max number of entity for scaling operations" - } - }, - "name": "ToscaServiceTemplateSimple", - "version": "1.0.0", - "metadata": {} -} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0?connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0?connectionTimeToLive=5000/.header deleted file mode 100644 index 6a280d972..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0?connectionTimeToLive=5000/.header +++ /dev/null @@ -1 +0,0 @@ -{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file new file mode 100644 index 000000000..778efae9e --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file @@ -0,0 +1,80 @@ +{ + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", + "policy_types": { + "onap.policies.controlloop.guard.Common": { + "properties": { + "id": { + "name": "id", + "type": "string", + "typeVersion": "0.0.0", + "description": "The Control Loop id this applies to.", + "required": false, + "constraints": [], + "metadata": {} + }, + "actor": { + "name": "actor", + "type": "string", + "typeVersion": "0.0.0", + "description": "Specifies the Actor the guard applies to.", + "required": true, + "constraints": [], + "metadata": {} + }, + "operation": { + "name": "operation", + "type": "string", + "typeVersion": "0.0.0", + "description": "Specified the operation that the actor is performing the guard applies to.", + "required": true, + "constraints": [], + "metadata": {} + }, + "timeRange": { + "name": "timeRange", + "type": "tosca.datatypes.TimeInterval", + "typeVersion": "0.0.0", + "description": "An optional range of time during the day the guard policy is valid for.\n", + "required": false, + "constraints": [], + "metadata": {} + } + }, + "name": "onap.policies.controlloop.guard.Common", + "version": "1.0.0", + "derived_from": "tosca.policies.Root", + "metadata": {}, + "description": "This is the base Policy Type for Guard policies that guard the execution of Operational\nPolicies.\n" + }, + "onap.policies.controlloop.guard.common.MinMax": { + "properties": { + "min": { + "name": "min", + "type": "integer", + "typeVersion": "0.0.0", + "description": "The minimum instances of this entity", + "required": true, + "constraints": [], + "metadata": {} + }, + "max": { + "name": "max", + "type": "integer", + "typeVersion": "0.0.0", + "description": "The maximum instances of this entity", + "required": false, + "constraints": [], + "metadata": {} + } + }, + "name": "onap.policies.controlloop.guard.common.MinMax", + "version": "1.0.0", + "derived_from": "onap.policies.controlloop.guard.Common", + "metadata": {}, + "description": "Supports Min/Max number of entity for scaling operations" + } + }, + "name": "ToscaServiceTemplateSimple", + "version": "1.0.0", + "metadata": {} +} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0?connectionTimeToLive=5000/.file deleted file mode 100644 index 78bdde746..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0?connectionTimeToLive=5000/.file +++ /dev/null @@ -1,40 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_1_0 -policy_types: - onap.policies.controlloop.guard.Common: - derived_from: tosca.policies.Root - version: 1.0.0 - description: | - This is the base Policy Type for Guard policies that guard the execution of Operational - Policies. - properties: - actor: - type: string - description: Specifies the Actor the guard applies to. - required: true - operation: - type: string - description: Specified the operation that the actor is performing the guard applies to. - required: true - timeRange: - type: tosca.datatypes.TimeInterval - description: | - An optional range of time during the day the guard policy is valid for. - required: false - id: - type: string - description: The Control Loop id this applies to. - required: false - onap.policies.controlloop.guard.common.MinMax: - derived_from: onap.policies.controlloop.guard.Common - type_version: 1.0.0 - version: 1.0.0 - description: Supports Min/Max number of entity for scaling operations - properties: - min: - type: integer - required: true - description: The minimum instances of this entity - max: - type: integer - required: false - description: The maximum instances of this entity \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0?connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0?connectionTimeToLive=5000/.header deleted file mode 100644 index 6a280d972..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0?connectionTimeToLive=5000/.header +++ /dev/null @@ -1 +0,0 @@ -{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file new file mode 100644 index 000000000..78bdde746 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file @@ -0,0 +1,40 @@ +tosca_definitions_version: tosca_simple_yaml_1_1_0 +policy_types: + onap.policies.controlloop.guard.Common: + derived_from: tosca.policies.Root + version: 1.0.0 + description: | + This is the base Policy Type for Guard policies that guard the execution of Operational + Policies. + properties: + actor: + type: string + description: Specifies the Actor the guard applies to. + required: true + operation: + type: string + description: Specified the operation that the actor is performing the guard applies to. + required: true + timeRange: + type: tosca.datatypes.TimeInterval + description: | + An optional range of time during the day the guard policy is valid for. + required: false + id: + type: string + description: The Control Loop id this applies to. + required: false + onap.policies.controlloop.guard.common.MinMax: + derived_from: onap.policies.controlloop.guard.Common + type_version: 1.0.0 + version: 1.0.0 + description: Supports Min/Max number of entity for scaling operations + properties: + min: + type: integer + required: true + description: The minimum instances of this entity + max: + type: integer + required: false + description: The maximum instances of this entity \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.file deleted file mode 100644 index 14ae7acd8..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.file +++ /dev/null @@ -1,360 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_1_0 -policy_types: - onap.policies.controlloop.operational.Common: - properties: - abatement: - name: abatement - type: boolean - typeVersion: 0.0.0 - description: Whether an abatement event message will be expected for - the control loop from DCAE. - default: 'false' - required: true - constraints: [ - ] - metadata: { - } - operations: - name: operations - type: list - typeVersion: 0.0.0 - description: List of operations to be performed when Control Loop - is triggered. - required: true - constraints: [ - ] - entry_schema: - type: onap.datatype.controlloop.Operation - typeVersion: 0.0.0 - constraints: [ - ] - metadata: { - } - trigger: - name: trigger - type: string - typeVersion: 0.0.0 - description: Initial operation to execute upon receiving an Onset - event message for the Control Loop. - required: true - constraints: [ - ] - metadata: { - } - timeout: - name: timeout - type: integer - typeVersion: 0.0.0 - description: | - Overall timeout for executing all the operations. This timeout should equal or exceed the total - timeout for each operation listed. - required: true - constraints: [ - ] - metadata: { - } - id: - name: id - type: string - typeVersion: 0.0.0 - description: The unique control loop id. - required: true - constraints: [ - ] - metadata: { - } - name: onap.policies.controlloop.operational.Common - version: 1.0.0 - derived_from: tosca.policies.Root - metadata: { - } - description: | - Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant - Policy Types. This does NOT support the legacy Policy YAML policy type. - onap.policies.controlloop.operational.common.Apex: - properties: - engineServiceParameters: - name: engineServiceParameters - type: string - typeVersion: 0.0.0 - description: The engine parameters like name, instanceCount, policy - implementation, parameters etc. - required: true - constraints: [ - ] - metadata: { - } - eventOutputParameters: - name: eventOutputParameters - type: string - typeVersion: 0.0.0 - description: The event output parameters. - required: true - constraints: [ - ] - metadata: { - } - javaProperties: - name: javaProperties - type: string - typeVersion: 0.0.0 - description: Name/value pairs of properties to be set for APEX if - needed. - required: false - constraints: [ - ] - metadata: { - } - eventInputParameters: - name: eventInputParameters - type: string - typeVersion: 0.0.0 - description: The event input parameters. - required: true - constraints: [ - ] - metadata: { - } - name: onap.policies.controlloop.operational.common.Apex - version: 1.0.0 - derived_from: onap.policies.controlloop.operational.Common - metadata: { - } - description: Operational policies for Apex PDP -data_types: - onap.datatype.controlloop.Actor: - constraints: [ - ] - properties: - payload: - name: payload - type: map - typeVersion: 0.0.0 - description: Name/value pairs of payload information passed by Policy - to the actor - required: false - constraints: [ - ] - entry_schema: - type: string - typeVersion: 0.0.0 - constraints: [ - ] - metadata: - clamp_possible_values: ClampExecution:CDS/payload - target: - name: target - type: onap.datatype.controlloop.Target - typeVersion: 0.0.0 - description: The resource the operation should be performed on. - required: true - constraints: [ - ] - metadata: { - } - actor: - name: actor - type: string - typeVersion: 0.0.0 - description: The actor performing the operation. - required: true - constraints: [ - ] - metadata: - clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor - operation: - name: operation - type: string - typeVersion: 0.0.0 - description: The operation the actor is performing. - required: true - constraints: [ - ] - metadata: - clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operation - name: onap.datatype.controlloop.Actor - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: { - } - description: An actor/operation/target definition - onap.datatype.controlloop.Operation: - constraints: [ - ] - properties: - failure_retries: - name: failure_retries - type: string - typeVersion: 0.0.0 - description: Points to the operation to invoke when the current operation - has exceeded its max retries. - default: final_failure_retries - required: false - constraints: [ - ] - metadata: { - } - id: - name: id - type: string - typeVersion: 0.0.0 - description: Unique identifier for the operation - required: true - constraints: [ - ] - metadata: { - } - failure_timeout: - name: failure_timeout - type: string - typeVersion: 0.0.0 - description: Points to the operation to invoke when the time out for - the operation occurs. - default: final_failure_timeout - required: false - constraints: [ - ] - metadata: { - } - failure: - name: failure - type: string - typeVersion: 0.0.0 - description: Points to the operation to invoke on Actor operation - failure. - default: final_failure - required: false - constraints: [ - ] - metadata: { - } - operation: - name: operation - type: onap.datatype.controlloop.Actor - typeVersion: 0.0.0 - description: The definition of the operation to be performed. - required: true - constraints: [ - ] - metadata: { - } - failure_guard: - name: failure_guard - type: string - typeVersion: 0.0.0 - description: Points to the operation to invoke when the current operation - is blocked due to guard policy enforcement. - default: final_failure_guard - required: false - constraints: [ - ] - metadata: { - } - retries: - name: retries - type: integer - typeVersion: 0.0.0 - description: The number of retries the actor should attempt to perform - the operation. - default: '0' - required: true - constraints: [ - ] - metadata: { - } - timeout: - name: timeout - type: integer - typeVersion: 0.0.0 - description: The amount of time for the actor to perform the operation. - required: true - constraints: [ - ] - metadata: { - } - failure_exception: - name: failure_exception - type: string - typeVersion: 0.0.0 - description: Points to the operation to invoke when the current operation - causes an exception. - default: final_failure_exception - required: false - constraints: [ - ] - metadata: { - } - description: - name: description - type: string - typeVersion: 0.0.0 - description: A user-friendly description of the intent for the operation - required: false - constraints: [ - ] - metadata: { - } - success: - name: success - type: string - typeVersion: 0.0.0 - description: Points to the operation to invoke on success. A value - of "final_success" indicates and end to the operation. - default: final_success - required: false - constraints: [ - ] - metadata: { - } - name: onap.datatype.controlloop.Operation - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: { - } - description: An operation supported by an actor - onap.datatype.controlloop.Target: - constraints: [ - ] - properties: - entityIds: - name: entityIds - type: map - typeVersion: 0.0.0 - description: | - Map of values that identify the resource. If none are provided, it is assumed that the - entity that generated the ONSET event will be the target. - required: false - constraints: [ - ] - entry_schema: - type: string - typeVersion: 0.0.0 - constraints: [ - ] - metadata: - clamp_possible_values: ClampExecution:CSAR_RESOURCES - targetType: - name: targetType - type: string - typeVersion: 0.0.0 - description: Category for the target type - required: true - constraints: - - valid_values: - - VNF - - VM - - VFMODULE - - PNF - metadata: { - } - name: onap.datatype.controlloop.Target - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: { - } - description: Definition for a entity in A&AI to perform a control loop operation - on -name: ToscaServiceTemplateSimple -version: 1.0.0 -metadata: { - } diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.header deleted file mode 100644 index 6a280d972..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.header +++ /dev/null @@ -1 +0,0 @@ -{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file new file mode 100644 index 000000000..14ae7acd8 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file @@ -0,0 +1,360 @@ +tosca_definitions_version: tosca_simple_yaml_1_1_0 +policy_types: + onap.policies.controlloop.operational.Common: + properties: + abatement: + name: abatement + type: boolean + typeVersion: 0.0.0 + description: Whether an abatement event message will be expected for + the control loop from DCAE. + default: 'false' + required: true + constraints: [ + ] + metadata: { + } + operations: + name: operations + type: list + typeVersion: 0.0.0 + description: List of operations to be performed when Control Loop + is triggered. + required: true + constraints: [ + ] + entry_schema: + type: onap.datatype.controlloop.Operation + typeVersion: 0.0.0 + constraints: [ + ] + metadata: { + } + trigger: + name: trigger + type: string + typeVersion: 0.0.0 + description: Initial operation to execute upon receiving an Onset + event message for the Control Loop. + required: true + constraints: [ + ] + metadata: { + } + timeout: + name: timeout + type: integer + typeVersion: 0.0.0 + description: | + Overall timeout for executing all the operations. This timeout should equal or exceed the total + timeout for each operation listed. + required: true + constraints: [ + ] + metadata: { + } + id: + name: id + type: string + typeVersion: 0.0.0 + description: The unique control loop id. + required: true + constraints: [ + ] + metadata: { + } + name: onap.policies.controlloop.operational.Common + version: 1.0.0 + derived_from: tosca.policies.Root + metadata: { + } + description: | + Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant + Policy Types. This does NOT support the legacy Policy YAML policy type. + onap.policies.controlloop.operational.common.Apex: + properties: + engineServiceParameters: + name: engineServiceParameters + type: string + typeVersion: 0.0.0 + description: The engine parameters like name, instanceCount, policy + implementation, parameters etc. + required: true + constraints: [ + ] + metadata: { + } + eventOutputParameters: + name: eventOutputParameters + type: string + typeVersion: 0.0.0 + description: The event output parameters. + required: true + constraints: [ + ] + metadata: { + } + javaProperties: + name: javaProperties + type: string + typeVersion: 0.0.0 + description: Name/value pairs of properties to be set for APEX if + needed. + required: false + constraints: [ + ] + metadata: { + } + eventInputParameters: + name: eventInputParameters + type: string + typeVersion: 0.0.0 + description: The event input parameters. + required: true + constraints: [ + ] + metadata: { + } + name: onap.policies.controlloop.operational.common.Apex + version: 1.0.0 + derived_from: onap.policies.controlloop.operational.Common + metadata: { + } + description: Operational policies for Apex PDP +data_types: + onap.datatype.controlloop.Actor: + constraints: [ + ] + properties: + payload: + name: payload + type: map + typeVersion: 0.0.0 + description: Name/value pairs of payload information passed by Policy + to the actor + required: false + constraints: [ + ] + entry_schema: + type: string + typeVersion: 0.0.0 + constraints: [ + ] + metadata: + clamp_possible_values: ClampExecution:CDS/payload + target: + name: target + type: onap.datatype.controlloop.Target + typeVersion: 0.0.0 + description: The resource the operation should be performed on. + required: true + constraints: [ + ] + metadata: { + } + actor: + name: actor + type: string + typeVersion: 0.0.0 + description: The actor performing the operation. + required: true + constraints: [ + ] + metadata: + clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor + operation: + name: operation + type: string + typeVersion: 0.0.0 + description: The operation the actor is performing. + required: true + constraints: [ + ] + metadata: + clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operation + name: onap.datatype.controlloop.Actor + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: { + } + description: An actor/operation/target definition + onap.datatype.controlloop.Operation: + constraints: [ + ] + properties: + failure_retries: + name: failure_retries + type: string + typeVersion: 0.0.0 + description: Points to the operation to invoke when the current operation + has exceeded its max retries. + default: final_failure_retries + required: false + constraints: [ + ] + metadata: { + } + id: + name: id + type: string + typeVersion: 0.0.0 + description: Unique identifier for the operation + required: true + constraints: [ + ] + metadata: { + } + failure_timeout: + name: failure_timeout + type: string + typeVersion: 0.0.0 + description: Points to the operation to invoke when the time out for + the operation occurs. + default: final_failure_timeout + required: false + constraints: [ + ] + metadata: { + } + failure: + name: failure + type: string + typeVersion: 0.0.0 + description: Points to the operation to invoke on Actor operation + failure. + default: final_failure + required: false + constraints: [ + ] + metadata: { + } + operation: + name: operation + type: onap.datatype.controlloop.Actor + typeVersion: 0.0.0 + description: The definition of the operation to be performed. + required: true + constraints: [ + ] + metadata: { + } + failure_guard: + name: failure_guard + type: string + typeVersion: 0.0.0 + description: Points to the operation to invoke when the current operation + is blocked due to guard policy enforcement. + default: final_failure_guard + required: false + constraints: [ + ] + metadata: { + } + retries: + name: retries + type: integer + typeVersion: 0.0.0 + description: The number of retries the actor should attempt to perform + the operation. + default: '0' + required: true + constraints: [ + ] + metadata: { + } + timeout: + name: timeout + type: integer + typeVersion: 0.0.0 + description: The amount of time for the actor to perform the operation. + required: true + constraints: [ + ] + metadata: { + } + failure_exception: + name: failure_exception + type: string + typeVersion: 0.0.0 + description: Points to the operation to invoke when the current operation + causes an exception. + default: final_failure_exception + required: false + constraints: [ + ] + metadata: { + } + description: + name: description + type: string + typeVersion: 0.0.0 + description: A user-friendly description of the intent for the operation + required: false + constraints: [ + ] + metadata: { + } + success: + name: success + type: string + typeVersion: 0.0.0 + description: Points to the operation to invoke on success. A value + of "final_success" indicates and end to the operation. + default: final_success + required: false + constraints: [ + ] + metadata: { + } + name: onap.datatype.controlloop.Operation + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: { + } + description: An operation supported by an actor + onap.datatype.controlloop.Target: + constraints: [ + ] + properties: + entityIds: + name: entityIds + type: map + typeVersion: 0.0.0 + description: | + Map of values that identify the resource. If none are provided, it is assumed that the + entity that generated the ONSET event will be the target. + required: false + constraints: [ + ] + entry_schema: + type: string + typeVersion: 0.0.0 + constraints: [ + ] + metadata: + clamp_possible_values: ClampExecution:CSAR_RESOURCES + targetType: + name: targetType + type: string + typeVersion: 0.0.0 + description: Category for the target type + required: true + constraints: + - valid_values: + - VNF + - VM + - VFMODULE + - PNF + metadata: { + } + name: onap.datatype.controlloop.Target + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: { + } + description: Definition for a entity in A&AI to perform a control loop operation + on +name: ToscaServiceTemplateSimple +version: 1.0.0 +metadata: { + } diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.file deleted file mode 100644 index af7a61ef7..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.file +++ /dev/null @@ -1,150 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_1_0 -policy_types: - onap.policies.controlloop.operational.common.Drools: - derived_from: onap.policies.controlloop.operational.Common - type_version: 1.0.0 - version: 1.0.0 - description: Operational policies for Drools PDP - properties: - controllerName: - type: string - description: Drools controller properties - required: false - onap.policies.controlloop.operational.Common: - derived_from: tosca.policies.Root - version: 1.0.0 - description: | - Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant - Policy Types. This does NOT support the legacy Policy YAML policy type. - properties: - id: - type: string - description: The unique control loop id. - required: true - timeout: - type: integer - description: | - Overall timeout for executing all the operations. This timeout should equal or exceed the total - timeout for each operation listed. - required: true - abatement: - type: boolean - description: Whether an abatement event message will be expected for the control loop from DCAE. - required: true - default: false - trigger: - type: string - description: Initial operation to execute upon receiving an Onset event message for the Control Loop. - required: true - operations: - type: list - description: List of operations to be performed when Control Loop is triggered. - required: true - entry_schema: - type: onap.datatype.controlloop.Operation -data_types: - onap.datatype.controlloop.Target: - derived_from: tosca.datatypes.Root - description: Definition for a entity in A&AI to perform a control loop operation on - properties: - targetType: - type: string - description: Category for the target type - required: true - constraints: - - valid_values: [VNF, VM, VFMODULE, PNF] - entityIds: - type: map - description: | - Map of values that identify the resource. If none are provided, it is assumed that the - entity that generated the ONSET event will be the target. - required: false - metadata: - clamp_possible_values: ClampExecution:CSAR_RESOURCES - entry_schema: - type: string - - onap.datatype.controlloop.Actor: - derived_from: tosca.datatypes.Root - description: An actor/operation/target definition - properties: - actor: - type: string - description: The actor performing the operation. - required: true - metadata: - clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor - operation: - type: string - description: The operation the actor is performing. - required: true - metadata: - clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operations - target: - type: onap.datatype.controlloop.Target - description: The resource the operation should be performed on. - required: true - payload: - type: map - description: Name/value pairs of payload information passed by Policy to the actor - required: false - metadata: - clamp_possible_values: ClampExecution:CDS/payload - entry_schema: - type: string - - onap.datatype.controlloop.Operation: - derived_from: tosca.datatypes.Root - description: An operation supported by an actor - properties: - id: - type: string - description: Unique identifier for the operation - required: true - description: - type: string - description: A user-friendly description of the intent for the operation - required: false - operation: - type: onap.datatype.controlloop.Actor - description: The definition of the operation to be performed. - required: true - timeout: - type: integer - description: The amount of time for the actor to perform the operation. - required: true - retries: - type: integer - description: The number of retries the actor should attempt to perform the operation. - required: true - default: 0 - success: - type: string - description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation. - required: false - default: final_success - failure: - type: string - description: Points to the operation to invoke on Actor operation failure. - required: false - default: final_failure - failure_timeout: - type: string - description: Points to the operation to invoke when the time out for the operation occurs. - required: false - default: final_failure_timeout - failure_retries: - type: string - description: Points to the operation to invoke when the current operation has exceeded its max retries. - required: false - default: final_failure_retries - failure_exception: - type: string - description: Points to the operation to invoke when the current operation causes an exception. - required: false - default: final_failure_exception - failure_guard: - type: string - description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement. - required: false - default: final_failure_guard \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.header deleted file mode 100644 index 6a280d972..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.header +++ /dev/null @@ -1 +0,0 @@ -{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file new file mode 100644 index 000000000..af7a61ef7 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file @@ -0,0 +1,150 @@ +tosca_definitions_version: tosca_simple_yaml_1_1_0 +policy_types: + onap.policies.controlloop.operational.common.Drools: + derived_from: onap.policies.controlloop.operational.Common + type_version: 1.0.0 + version: 1.0.0 + description: Operational policies for Drools PDP + properties: + controllerName: + type: string + description: Drools controller properties + required: false + onap.policies.controlloop.operational.Common: + derived_from: tosca.policies.Root + version: 1.0.0 + description: | + Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant + Policy Types. This does NOT support the legacy Policy YAML policy type. + properties: + id: + type: string + description: The unique control loop id. + required: true + timeout: + type: integer + description: | + Overall timeout for executing all the operations. This timeout should equal or exceed the total + timeout for each operation listed. + required: true + abatement: + type: boolean + description: Whether an abatement event message will be expected for the control loop from DCAE. + required: true + default: false + trigger: + type: string + description: Initial operation to execute upon receiving an Onset event message for the Control Loop. + required: true + operations: + type: list + description: List of operations to be performed when Control Loop is triggered. + required: true + entry_schema: + type: onap.datatype.controlloop.Operation +data_types: + onap.datatype.controlloop.Target: + derived_from: tosca.datatypes.Root + description: Definition for a entity in A&AI to perform a control loop operation on + properties: + targetType: + type: string + description: Category for the target type + required: true + constraints: + - valid_values: [VNF, VM, VFMODULE, PNF] + entityIds: + type: map + description: | + Map of values that identify the resource. If none are provided, it is assumed that the + entity that generated the ONSET event will be the target. + required: false + metadata: + clamp_possible_values: ClampExecution:CSAR_RESOURCES + entry_schema: + type: string + + onap.datatype.controlloop.Actor: + derived_from: tosca.datatypes.Root + description: An actor/operation/target definition + properties: + actor: + type: string + description: The actor performing the operation. + required: true + metadata: + clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor + operation: + type: string + description: The operation the actor is performing. + required: true + metadata: + clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operations + target: + type: onap.datatype.controlloop.Target + description: The resource the operation should be performed on. + required: true + payload: + type: map + description: Name/value pairs of payload information passed by Policy to the actor + required: false + metadata: + clamp_possible_values: ClampExecution:CDS/payload + entry_schema: + type: string + + onap.datatype.controlloop.Operation: + derived_from: tosca.datatypes.Root + description: An operation supported by an actor + properties: + id: + type: string + description: Unique identifier for the operation + required: true + description: + type: string + description: A user-friendly description of the intent for the operation + required: false + operation: + type: onap.datatype.controlloop.Actor + description: The definition of the operation to be performed. + required: true + timeout: + type: integer + description: The amount of time for the actor to perform the operation. + required: true + retries: + type: integer + description: The number of retries the actor should attempt to perform the operation. + required: true + default: 0 + success: + type: string + description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation. + required: false + default: final_success + failure: + type: string + description: Points to the operation to invoke on Actor operation failure. + required: false + default: final_failure + failure_timeout: + type: string + description: Points to the operation to invoke when the time out for the operation occurs. + required: false + default: final_failure_timeout + failure_retries: + type: string + description: Points to the operation to invoke when the current operation has exceeded its max retries. + required: false + default: final_failure_retries + failure_exception: + type: string + description: Points to the operation to invoke when the current operation causes an exception. + required: false + default: final_failure_exception + failure_guard: + type: string + description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement. + required: false + default: final_failure_guard \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0?connectionTimeToLive=5000/.file deleted file mode 100644 index 3c17c9004..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0?connectionTimeToLive=5000/.file +++ /dev/null @@ -1,158 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_1_0 -policy_types: - onap.policies.Monitoring: - derived_from: tosca.policies.Root - version: 1.0.0 - description: a base policy type for all policies that govern monitoring provisioning - onap.policies.monitoring.cdap.tca.hi.lo.app: - derived_from: onap.policies.Monitoring - version: 1.0.0 - properties: - tca_policy: - type: onap.datatypes.monitoring.tca_policy - description: TCA Policy JSON - required: true -data_types: - onap.datatypes.monitoring.metricsPerEventName: - derived_from: tosca.datatypes.Root - properties: - controlLoopSchemaType: - type: string - required: true - description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM - constraints: - - valid_values: - - VM - - VNF - eventName: - type: string - required: true - description: Event name to which thresholds need to be applied - policyName: - type: string - required: true - description: TCA Policy Scope Name - policyScope: - type: string - required: true - description: TCA Policy Scope - policyVersion: - type: string - required: true - description: TCA Policy Scope Version - thresholds: - type: list - required: true - description: Thresholds associated with eventName - entry_schema: - type: onap.datatypes.monitoring.thresholds - onap.datatypes.monitoring.tca_policy: - derived_from: tosca.datatypes.Root - properties: - domain: - type: string - required: true - description: Domain name to which TCA needs to be applied - default: measurementsForVfScaling - constraints: - - equal: measurementsForVfScaling - metricsPerEventName: - type: list - required: true - description: Contains eventName and threshold details that need to be applied to given eventName - entry_schema: - type: onap.datatypes.monitoring.metricsPerEventName - onap.datatypes.monitoring.thresholds: - derived_from: tosca.datatypes.Root - properties: - closedLoopControlName: - type: string - required: true - description: Closed Loop Control Name associated with the threshold - closedLoopEventStatus: - type: string - required: true - description: Closed Loop Event Status of the threshold - constraints: - - valid_values: - - ONSET - - ABATED - direction: - type: string - required: true - description: Direction of the threshold - constraints: - - valid_values: - - LESS - - LESS_OR_EQUAL - - GREATER - - GREATER_OR_EQUAL - - EQUAL - fieldPath: - type: string - required: true - description: Json field Path as per CEF message which needs to be analyzed for TCA - constraints: - - valid_values: - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage - - $.event.measurementsForVfScalingFields.meanRequestLatency - - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered - - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached - - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured - - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree - - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed - - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value - severity: - type: string - required: true - description: Threshold Event Severity - constraints: - - valid_values: - - CRITICAL - - MAJOR - - MINOR - - WARNING - - NORMAL - thresholdValue: - type: integer - required: true - description: Threshold value for the field Path inside CEF message - version: - type: string - required: true - description: Version number associated with the threshold \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0?connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0?connectionTimeToLive=5000/.header deleted file mode 100644 index 6a280d972..000000000 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0?connectionTimeToLive=5000/.header +++ /dev/null @@ -1 +0,0 @@ -{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file new file mode 100644 index 000000000..3c17c9004 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file @@ -0,0 +1,158 @@ +tosca_definitions_version: tosca_simple_yaml_1_1_0 +policy_types: + onap.policies.Monitoring: + derived_from: tosca.policies.Root + version: 1.0.0 + description: a base policy type for all policies that govern monitoring provisioning + onap.policies.monitoring.cdap.tca.hi.lo.app: + derived_from: onap.policies.Monitoring + version: 1.0.0 + properties: + tca_policy: + type: onap.datatypes.monitoring.tca_policy + description: TCA Policy JSON + required: true +data_types: + onap.datatypes.monitoring.metricsPerEventName: + derived_from: tosca.datatypes.Root + properties: + controlLoopSchemaType: + type: string + required: true + description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM + constraints: + - valid_values: + - VM + - VNF + eventName: + type: string + required: true + description: Event name to which thresholds need to be applied + policyName: + type: string + required: true + description: TCA Policy Scope Name + policyScope: + type: string + required: true + description: TCA Policy Scope + policyVersion: + type: string + required: true + description: TCA Policy Scope Version + thresholds: + type: list + required: true + description: Thresholds associated with eventName + entry_schema: + type: onap.datatypes.monitoring.thresholds + onap.datatypes.monitoring.tca_policy: + derived_from: tosca.datatypes.Root + properties: + domain: + type: string + required: true + description: Domain name to which TCA needs to be applied + default: measurementsForVfScaling + constraints: + - equal: measurementsForVfScaling + metricsPerEventName: + type: list + required: true + description: Contains eventName and threshold details that need to be applied to given eventName + entry_schema: + type: onap.datatypes.monitoring.metricsPerEventName + onap.datatypes.monitoring.thresholds: + derived_from: tosca.datatypes.Root + properties: + closedLoopControlName: + type: string + required: true + description: Closed Loop Control Name associated with the threshold + closedLoopEventStatus: + type: string + required: true + description: Closed Loop Event Status of the threshold + constraints: + - valid_values: + - ONSET + - ABATED + direction: + type: string + required: true + description: Direction of the threshold + constraints: + - valid_values: + - LESS + - LESS_OR_EQUAL + - GREATER + - GREATER_OR_EQUAL + - EQUAL + fieldPath: + type: string + required: true + description: Json field Path as per CEF message which needs to be analyzed for TCA + constraints: + - valid_values: + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated + - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated + - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle + - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt + - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice + - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq + - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal + - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem + - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait + - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage + - $.event.measurementsForVfScalingFields.meanRequestLatency + - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered + - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached + - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured + - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree + - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed + - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value + severity: + type: string + required: true + description: Threshold Event Severity + constraints: + - valid_values: + - CRITICAL + - MAJOR + - MINOR + - WARNING + - NORMAL + thresholdValue: + type: integer + required: true + description: Threshold value for the field Path inside CEF message + version: + type: string + required: true + description: Version number associated with the threshold \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/pap/v1/pdps?connectionTimeToLive=5000/.file deleted file mode 100644 index f16f4e899..000000000 --- a/src/test/resources/http-cache/example/policy/pap/v1/pdps?connectionTimeToLive=5000/.file +++ /dev/null @@ -1,80 +0,0 @@ -{ - "groups": [ - { - "description": "This group should be used for managing all control loop related policies and pdps", - "name": "controlloop", - "pdpGroupState": "ACTIVE", - "pdpSubgroups": [ - { - "currentInstanceCount": 0, - "desiredInstanceCount": 1, - "pdpInstances": [], - "pdpType": "apex", - "policies": [], - "properties": {}, - "supportedPolicyTypes": [ - { - "name": "onap.policies.controlloop.Operational", - "version": "1.0.0" - } - ] - }, - { - "currentInstanceCount": 0, - "desiredInstanceCount": 1, - "pdpInstances": [], - "pdpType": "drools", - "policies": [], - "properties": {}, - "supportedPolicyTypes": [ - { - "name": "onap.policies.controlloop.operational.common.*", - "version": "1.0.0" - }, - { - "name": "onap.policies.controlloop.Operational", - "version": "1.0.0" - } - ] - }, - { - "currentInstanceCount": 0, - "desiredInstanceCount": 1, - "pdpInstances": [], - "pdpType": "xacml", - "policies": [], - "properties": {}, - "supportedPolicyTypes": [ - { - "name": "onap.policies.controlloop.guard.common.*", - "version": "1.0.0" - } - ] - } - ], - "properties": {} - }, - { - "description": "This group should be used for managing all monitoring related policies and pdps", - "name": "monitoring", - "pdpGroupState": "ACTIVE", - "pdpSubgroups": [ - { - "currentInstanceCount": 0, - "desiredInstanceCount": 1, - "pdpInstances": [], - "pdpType": "xacml", - "policies": [], - "properties": {}, - "supportedPolicyTypes": [ - { - "name": "onap.policies.monitoring.*", - "version": "1.0.0" - } - ] - } - ], - "properties": {} - } - ] -} diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps?connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/pap/v1/pdps?connectionTimeToLive=5000/.header deleted file mode 100644 index 6a280d972..000000000 --- a/src/test/resources/http-cache/example/policy/pap/v1/pdps?connectionTimeToLive=5000/.header +++ /dev/null @@ -1 +0,0 @@ -{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file b/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file new file mode 100644 index 000000000..f16f4e899 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file @@ -0,0 +1,80 @@ +{ + "groups": [ + { + "description": "This group should be used for managing all control loop related policies and pdps", + "name": "controlloop", + "pdpGroupState": "ACTIVE", + "pdpSubgroups": [ + { + "currentInstanceCount": 0, + "desiredInstanceCount": 1, + "pdpInstances": [], + "pdpType": "apex", + "policies": [], + "properties": {}, + "supportedPolicyTypes": [ + { + "name": "onap.policies.controlloop.Operational", + "version": "1.0.0" + } + ] + }, + { + "currentInstanceCount": 0, + "desiredInstanceCount": 1, + "pdpInstances": [], + "pdpType": "drools", + "policies": [], + "properties": {}, + "supportedPolicyTypes": [ + { + "name": "onap.policies.controlloop.operational.common.*", + "version": "1.0.0" + }, + { + "name": "onap.policies.controlloop.Operational", + "version": "1.0.0" + } + ] + }, + { + "currentInstanceCount": 0, + "desiredInstanceCount": 1, + "pdpInstances": [], + "pdpType": "xacml", + "policies": [], + "properties": {}, + "supportedPolicyTypes": [ + { + "name": "onap.policies.controlloop.guard.common.*", + "version": "1.0.0" + } + ] + } + ], + "properties": {} + }, + { + "description": "This group should be used for managing all monitoring related policies and pdps", + "name": "monitoring", + "pdpGroupState": "ACTIVE", + "pdpSubgroups": [ + { + "currentInstanceCount": 0, + "desiredInstanceCount": 1, + "pdpInstances": [], + "pdpType": "xacml", + "policies": [], + "properties": {}, + "supportedPolicyTypes": [ + { + "name": "onap.policies.monitoring.*", + "version": "1.0.0" + } + ] + } + ], + "properties": {} + } + ] +} diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header b/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"} \ No newline at end of file diff --git a/src/test/resources/http-cache/third_party_proxy.py b/src/test/resources/http-cache/third_party_proxy.py index 97a2a1a18..7fe316852 100755 --- a/src/test/resources/http-cache/third_party_proxy.py +++ b/src/test/resources/http-cache/third_party_proxy.py @@ -179,7 +179,7 @@ class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler): elif self.path.startswith("/dcae-deployments/") and http_type == "PUT": print "self.path start with /dcae-deployments/ DEPLOY, generating response json..." #jsondata = json.loads(self.data_string) - jsonGenerated = "{\"operationType\":\"install\",\"status\":\"processing\",\"links\":{\"status\":\"http:\/\/" + PROXY_ADDRESS + "\/dcae-operationstatus/install\"}}" + jsonGenerated = "{\"operationType\":\"install\",\"status\":\"processing\",\"links\":{\"status\":\"http:\/\/" + PROXY_ADDRESS + "\/dcae-operationstatus/install?test=test\"}}" print "jsonGenerated: " + jsonGenerated if not os.path.exists(cached_file_folder): os.makedirs(cached_file_folder, 0777) @@ -191,7 +191,7 @@ class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler): elif self.path.startswith("/dcae-deployments/") and http_type == "DELETE": print "self.path start with /dcae-deployments/ UNDEPLOY, generating response json..." #jsondata = json.loads(self.data_string) - jsonGenerated = "{\"operationType\":\"uninstall\",\"status\":\"processing\",\"links\":{\"status\":\"http:\/\/" + PROXY_ADDRESS + "\/dcae-operationstatus/uninstall\"}}" + jsonGenerated = "{\"operationType\":\"uninstall\",\"status\":\"processing\",\"links\":{\"status\":\"http:\/\/" + PROXY_ADDRESS + "\/dcae-operationstatus/uninstall?test=test\"}}" print "jsonGenerated: " + jsonGenerated if not os.path.exists(cached_file_folder): os.makedirs(cached_file_folder, 0777) -- cgit 1.2.3-korg

        JsonObject

        legacy
        -optional

        boolean

        loopElementModel
        optional

        LoopElementModel

        JsonObject

        legacy
        -optional

        boolean

        loop
        optional

        Loop