Merge "Fix entityId bug"

diff --cc src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
Simple merge

diff --cc src/test/resources/tosca/operational-policy-cds-payload-with-list.json
Simple merge

diff --cc src/test/resources/tosca/operational-policy-json-schema.json
index 081e0f2,f6c180a..32adce9
--- 1/src/test/resources/tosca/operational-policy-json-schema.json
--- 2/src/test/resources/tosca/operational-policy-json-schema.json
+++ b/src/test/resources/tosca/operational-policy-json-schema.json
@@@ -939,6 -944,155 +943,6 @@@
            }
          }
        }
 -    },
 -    "guard_policies": {
 -      "type": "array",
 -      "format": "tabs-top",
 -      "title": "Associated Guard policies",
 -      "items": {
 -        "headerTemplate": "{{self.policy-id}} - {{self.content.recipe}}",
 -        "anyOf": [
 -          {
 -            "title": "Guard MinMax",
 -            "type": "object",
 -            "properties": {
 -              "policy-id": {
 -                "type": "string",
 -                "default": "guard.minmax.new",
 -                "pattern": "^(guard.minmax\\..*)$"
 -              },
 -              "content": {
 -                "properties": {
 -                  "actor": {
 -                    "type": "string",
 -                    "enum": [
 -                      "APPC",
 -                      "SO",
 -                      "VFC",
 -                      "SDNC",
 -                      "SDNR"
 -                    ]
 -                  },
 -                  "recipe": {
 -                    "type": "string",
 -                    "enum": [
 -                      "Restart",
 -                      "Rebuild",
 -                      "Migrate",
 -                      "Health-Check",
 -                      "ModifyConfig",
 -                      "VF Module Create",
 -                      "VF Module Delete",
 -                      "Reroute"
 -                    ]
 -                  },
 -                  "targets": {
 -                    "type": "string",
 -                    "default": ".*"
 -                  },
 -                  "clname": {
 -                    "type": "string",
 -                    "template": "{{loopName}}",
 -                    "watch": {
 -                      "loopName": "operational_policy.controlLoop.controlLoopName"
 -                    }
 -                  },
 -                  "guardActiveStart": {
 -                    "type": "string",
 -                    "default": "00:00:00Z"
 -                  },
 -                  "guardActiveEnd": {
 -                    "type": "string",
 -                    "default": "10:00:00Z"
 -                  },
 -                  "min": {
 -                    "type": "string",
 -                    "default": "0"
 -                  },
 -                  "max": {
 -                    "type": "string",
 -                    "default": "1"
 -                  }
 -                }
 -              }
 -            }
 -          },
 -          {
 -            "title": "Guard Frequency",
 -            "type": "object",
 -            "properties": {
 -              "policy-id": {
 -                "type": "string",
 -                "default": "guard.frequency.new",
 -                "pattern": "^(guard.frequency\\..*)$"
 -              },
 -              "content": {
 -                "properties": {
 -                  "actor": {
 -                    "type": "string",
 -                    "enum": [
 -                      "APPC",
 -                      "SO",
 -                      "VFC",
 -                      "SDNC",
 -                      "SDNR"
 -                    ]
 -                  },
 -                  "recipe": {
 -                    "type": "string",
 -                    "enum": [
 -                      "Restart",
 -                      "Rebuild",
 -                      "Migrate",
 -                      "Health-Check",
 -                      "ModifyConfig",
 -                      "VF Module Create",
 -                      "VF Module Delete",
 -                      "Reroute"
 -                    ]
 -                  },
 -                  "targets": {
 -                    "type": "string",
 -                    "default": ".*"
 -                  },
 -                  "clname": {
 -                    "type": "string",
 -                    "template": "{{loopName}}",
 -                    "watch": {
 -                      "loopName": "operational_policy.controlLoop.controlLoopName"
 -                    }
 -                  },
 -                  "guardActiveStart": {
 -                    "type": "string",
 -                    "default": "00:00:00Z"
 -                  },
 -                  "guardActiveEnd": {
 -                    "type": "string",
 -                    "default": "10:00:00Z"
 -                  },
 -                  "limit": {
 -                    "type": "string"
 -                  },
 -                  "timeWindow": {
 -                    "type": "string"
 -                  },
 -                  "timeUnits": {
 -                    "type": "string",
 -                    "enum": [
 -                      "minute",
 -                      "hour",
 -                      "day",
 -                      "week",
 -                      "month",
 -                      "year"
 -                    ]
 -                  }
 -                }
 -              }
 -            }
 -          }
 -        ]
 -      }
      }
    }
- }
+ }