From: Michael Lando Date: Tue, 11 Jul 2017 21:54:52 +0000 (+0300) Subject: [sdc] rebase update X-Git-Tag: 1.0.0-Amsterdam~232 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dd60339b06d252fcb1382aa97ab3d65b37dad021;p=sdc.git [sdc] rebase update Change-Id: I8f1fc7150975122dd9f3f4e653b9983064b399a6 Signed-off-by: Michael Lando --- diff --git a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/imports/FilteredDataByParamsComponentServletTest.java b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/imports/FilteredDataByParamsComponentServletTest.java index 541294c141..e434f88ad5 100644 --- a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/imports/FilteredDataByParamsComponentServletTest.java +++ b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/imports/FilteredDataByParamsComponentServletTest.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.ci.tests.execute.imports; import static org.testng.AssertJUnit.assertEquals; diff --git a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/migration/v1707/CommonMigrationUtils.java b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/migration/v1707/CommonMigrationUtils.java index e142e4caa3..41a4eb0f3b 100644 --- a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/migration/v1707/CommonMigrationUtils.java +++ b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/migration/v1707/CommonMigrationUtils.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.ci.tests.migration.v1707; import com.thinkaurelius.titan.core.TitanGraph; diff --git a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/migration/v1707/postupgrade/AttKeyPropertiesRenameTest.java b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/migration/v1707/postupgrade/AttKeyPropertiesRenameTest.java index 95fc068dd3..18ade957cf 100644 --- a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/migration/v1707/postupgrade/AttKeyPropertiesRenameTest.java +++ b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/migration/v1707/postupgrade/AttKeyPropertiesRenameTest.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.ci.tests.migration.v1707.postupgrade; import com.thinkaurelius.titan.core.TitanVertex; diff --git a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/migration/v1707/preupgrade/AttKeyPropertiesBeforeRenameTest.java b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/migration/v1707/preupgrade/AttKeyPropertiesBeforeRenameTest.java index 3b4f6349a7..81fe8b4acf 100644 --- a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/migration/v1707/preupgrade/AttKeyPropertiesBeforeRenameTest.java +++ b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/migration/v1707/preupgrade/AttKeyPropertiesBeforeRenameTest.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.ci.tests.migration.v1707.preupgrade; import com.thinkaurelius.titan.core.TitanVertex; diff --git a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/utils/graph/GraphFileUtils.java b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/utils/graph/GraphFileUtils.java index 2fa5807aff..91e7a3fae9 100644 --- a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/utils/graph/GraphFileUtils.java +++ b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/utils/graph/GraphFileUtils.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.ci.tests.utils.graph; import com.thinkaurelius.titan.core.TitanVertex; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphJsonValidator.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphJsonValidator.java index 2ad4faceb7..1ce976dbe5 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphJsonValidator.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphJsonValidator.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/TitanGraphInitializer.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/TitanGraphInitializer.java index ace1c038f2..11d52023f8 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/TitanGraphInitializer.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/TitanGraphInitializer.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl; import java.util.ArrayList; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/Migration1707Task.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/Migration1707Task.java index 92e185dbd7..2c19c94cff 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/Migration1707Task.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/Migration1707Task.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration; /** diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/MigrationException.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/MigrationException.java index f54fccc0c1..8e958b9ad1 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/MigrationException.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/MigrationException.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration; public class MigrationException extends RuntimeException { diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/MigrationMsg.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/MigrationMsg.java index 3f8b55b3a5..e743e5387b 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/MigrationMsg.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/MigrationMsg.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration; public enum MigrationMsg { diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/MigrationOperationUtils.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/MigrationOperationUtils.java index a4595b2ec8..7a34521d93 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/MigrationOperationUtils.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/MigrationOperationUtils.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration; import com.thinkaurelius.titan.core.PropertyKey; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/DistributionStatusUpdate.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/DistributionStatusUpdate.java index 7c0b57fb1d..744965ff68 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/DistributionStatusUpdate.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/DistributionStatusUpdate.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707; import java.util.EnumMap; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707.java index 84214cc0b0..1012ebddd4 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707; import org.openecomp.sdc.asdctool.impl.migration.Migration1707Task; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707ArtifactUuidFix.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707ArtifactUuidFix.java index d8b2f62705..c14301ae5e 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707ArtifactUuidFix.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707ArtifactUuidFix.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707; import java.io.BufferedWriter; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707Config.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707Config.java index 93081e00a3..21a6ae1416 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707Config.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707Config.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707RelationsFix.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707RelationsFix.java index 47bce78893..204f0a5fc8 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707RelationsFix.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707RelationsFix.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707; import java.util.EnumMap; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707VnfFix.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707VnfFix.java index d3bd494a85..5d7a887a7f 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707VnfFix.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707VnfFix.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707; import java.util.EnumMap; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/MigrationTitanStrategy.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/MigrationTitanStrategy.java index 9a0cc89dd6..0274ca425e 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/MigrationTitanStrategy.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/MigrationTitanStrategy.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707; import org.openecomp.sdc.be.config.ConfigurationManager; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/MigrationUtils.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/MigrationUtils.java index 81a00b0444..04f810af5e 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/MigrationUtils.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/MigrationUtils.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707; import org.apache.commons.lang.enums.Enum; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/RenameGraphPropertyKeys.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/RenameGraphPropertyKeys.java index a1c1b6b4cc..9f571167db 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/RenameGraphPropertyKeys.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/RenameGraphPropertyKeys.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707; import org.openecomp.sdc.asdctool.impl.migration.*; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/ToscaNamesUpdate.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/ToscaNamesUpdate.java index 5213fae619..665fe15315 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/ToscaNamesUpdate.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/ToscaNamesUpdate.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707; import java.util.ArrayList; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/ToscaTemplateRegeneration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/ToscaTemplateRegeneration.java index 555a54d038..7d009fe158 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/ToscaTemplateRegeneration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/ToscaTemplateRegeneration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707; import java.util.EnumMap; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/VfModulesPropertiesAdding.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/VfModulesPropertiesAdding.java index ca1ed2b2a8..89ac6f7cb6 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/VfModulesPropertiesAdding.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/VfModulesPropertiesAdding.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707; import java.util.ArrayList; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/CategoriesUtils.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/CategoriesUtils.java index 2ba7e013f0..44d95395d0 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/CategoriesUtils.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/CategoriesUtils.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import org.openecomp.sdc.be.model.category.CategoryDefinition; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ComponentMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ComponentMigration.java index 51e51d4c02..d69363be89 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ComponentMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ComponentMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ConsumersMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ConsumersMigration.java index 83078baf6e..c455f870aa 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ConsumersMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ConsumersMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/InvariantUUIDResolver.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/InvariantUUIDResolver.java index bf28507877..e26a01e1b4 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/InvariantUUIDResolver.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/InvariantUUIDResolver.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import org.openecomp.sdc.be.model.Component; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/JsonModelMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/JsonModelMigration.java index 4e62b2f497..76c66de1c9 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/JsonModelMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/JsonModelMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/MigrationByIdDerivedNodeTypeResolver.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/MigrationByIdDerivedNodeTypeResolver.java index 0522ed965d..066ab9a01a 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/MigrationByIdDerivedNodeTypeResolver.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/MigrationByIdDerivedNodeTypeResolver.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/NodeTemplateMissingDataResolver.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/NodeTemplateMissingDataResolver.java index f0763a138c..01e36345e1 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/NodeTemplateMissingDataResolver.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/NodeTemplateMissingDataResolver.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/NormativesMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/NormativesMigration.java index e95a724be2..1717b1fa83 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/NormativesMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/NormativesMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/NormativesResolver.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/NormativesResolver.java index 205faf5355..cc9e6ec972 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/NormativesResolver.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/NormativesResolver.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ResourceVersionMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ResourceVersionMigration.java index ee222a721b..aeb85a7d35 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ResourceVersionMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ResourceVersionMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ResourcesCategoriesMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ResourcesCategoriesMigration.java index 5285c4c406..f605d8c3fa 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ResourcesCategoriesMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ResourcesCategoriesMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ServiceCategoriesMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ServiceCategoriesMigration.java index f8f79ad9ba..857bcd9b43 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ServiceCategoriesMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ServiceCategoriesMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ServiceVersionMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ServiceVersionMigration.java index 4a96c2743d..32ef06a220 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ServiceVersionMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ServiceVersionMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ServicesMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ServicesMigration.java index a6134070d4..040d220912 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ServicesMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/ServicesMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import java.util.ArrayList; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/UserStatesMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/UserStatesMigration.java index 67d9235cee..3f62273931 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/UserStatesMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/UserStatesMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import com.thinkaurelius.titan.core.TitanVertex; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/UsersMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/UsersMigration.java index a578f066bf..6e0a8a9247 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/UsersMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/UsersMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/VFResourcesMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/VFResourcesMigration.java index 74755c8326..82d22addf3 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/VFResourcesMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/VFResourcesMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import java.util.List; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/VersionMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/VersionMigration.java index 145ae28c81..514760fba2 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/VersionMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/VersionMigration.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/FulfilledCapabilitiesMigrationService.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/FulfilledCapabilitiesMigrationService.java index 4a91290dbc..23b1afec93 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/FulfilledCapabilitiesMigrationService.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/FulfilledCapabilitiesMigrationService.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel.relations; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/FulfilledCapabilityRequirementMigrationService.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/FulfilledCapabilityRequirementMigrationService.java index aad2eb4412..33b5574408 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/FulfilledCapabilityRequirementMigrationService.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/FulfilledCapabilityRequirementMigrationService.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel.relations; import fj.Function; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/FulfilledRequirementsMigrationService.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/FulfilledRequirementsMigrationService.java index 33c6b2254e..2b720af751 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/FulfilledRequirementsMigrationService.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/FulfilledRequirementsMigrationService.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel.relations; import fj.data.Either; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/RequirementsCapabilitiesMigrationService.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/RequirementsCapabilitiesMigrationService.java index f74e40a8fc..e468dd2fc5 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/RequirementsCapabilitiesMigrationService.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/relations/RequirementsCapabilitiesMigrationService.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel.relations; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/SdcSchemaFileImport.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/SdcSchemaFileImport.java index edeb56787b..efc34a7bc0 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/SdcSchemaFileImport.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/SdcSchemaFileImport.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.asdctool.main; import java.io.File; diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/ArtifactsResolver.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/ArtifactsResolver.java index 95f1edd61f..0762872797 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/ArtifactsResolver.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/ArtifactsResolver.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.components; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java index 7ef3a1961f..141ed95575 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.components.impl; import org.openecomp.sdc.be.components.ArtifactsResolver; diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java index e5d380a836..cb04cfcdc9 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java @@ -3599,10 +3599,11 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic { protected Either generateArtifactPayload(ArtifactDefinition artifactDefinition, ComponentTypeEnum componentType, org.openecomp.sdc.be.model.Component component, String resourceInstanceName, User modifier, boolean shouldLock, Supplier payloadUpdateDateGen, Supplier> esDataCreator, String instanceId) { + + log.trace("Start generating payload for {} artifact {}", artifactDefinition.getArtifactType(), artifactDefinition.getEsId()); + if (artifactDefinition.getPayloadUpdateDate() == null || artifactDefinition.getPayloadUpdateDate() == 0 || artifactDefinition.getPayloadUpdateDate() <= payloadUpdateDateGen.get()) { - if (artifactDefinition.getPayloadUpdateDate() == null || artifactDefinition.getPayloadUpdateDate() == 0 || artifactDefinition.getPayloadUpdateDate() < payloadUpdateDateGen.get()) { - - log.trace("Generaing payload for {} artifact {}", artifactDefinition.getArtifactType(), artifactDefinition.getEsId()); + log.trace("Generating payload for {} artifact {}", artifactDefinition.getArtifactType(), artifactDefinition.getEsId()); Either artifactDataRes = esDataCreator.get(); ESArtifactData artifactData = null; @@ -3664,6 +3665,7 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic { artifactDefinition.setArtifactChecksum(newCheckSum); // artifactToscaOperation.updateUUID(artifactDefinition, oldCheckSum, artifactDefinition.getArtifactVersion()); artifactDefinition.setEsId(artifactDefinition.getUniqueId()); + log.trace("No real update done in payload for {} artifact, updating payloadUpdateDate {}", artifactDefinition.getArtifactType(), artifactDefinition.getEsId()); updateArifactDefinitionStatus = artifactToscaOperation.updateArifactOnResource(artifactDefinition, component.getUniqueId(), artifactDefinition.getUniqueId(), componentType.getNodeType(), instanceId); log.trace("Update Payload ", artifactDefinition.getEsId()); diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java index 8d8aa72c8f..643b35d17b 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java @@ -41,6 +41,7 @@ import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.dao.titan.TitanOperationStatus; +import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition; import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition; import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition; import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition; @@ -557,7 +558,8 @@ public abstract class ComponentInstanceBusinessLogic extends BaseBusinessLogic { ComponentInstance origInst = iterator.next(); Optional op = componentInstanceList.stream().filter(ci -> ci.getUniqueId().equals(origInst.getUniqueId())).findAny(); if(op.isPresent()){ - ComponentInstance updatedCi = op.get(); + ComponentInstance updatedCi = op.get(); + updatedCi.setCustomizationUUID(origInst.getCustomizationUUID()); Boolean isUniqueName = validateInstanceNameUniquenessUponUpdate(containerComponent, origInst, updatedCi.getName()); if(!isUniqueName){ CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update the name of the component instance {} to {}. A component instance with the same name already exists. ", @@ -1636,6 +1638,7 @@ public abstract class ComponentInstanceBusinessLogic extends BaseBusinessLogic { newComponentInstance.setPosX(resResourceInfo.getPosX()); newComponentInstance.setPosY(resResourceInfo.getPosY()); newComponentInstance.setDescription(resResourceInfo.getDescription()); + newComponentInstance.setToscaComponentName(((ResourceMetadataDataDefinition)origComponent.getComponentMetadataDefinition().getMetadataDataDefinition()).getToscaResourceName()); resultOp = createComponentInstanceOnGraph(containerComponent, origComponent, newComponentInstance, user); diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ComponentValidations.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ComponentValidations.java index b50c8ef9d1..7964b4406c 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ComponentValidations.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ComponentValidations.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.components.validation; import org.openecomp.sdc.be.model.Component; diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java index 6edfe81fee..f2a5b35562 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datamodel.utils; import java.util.ArrayList; diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionCatalogServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionCatalogServlet.java index 5ed0719f90..7001740a18 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionCatalogServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionCatalogServlet.java @@ -98,7 +98,7 @@ public class DistributionCatalogServlet extends BeGenericServlet { @ApiOperation(value = "Download service artifact", httpMethod = "GET", notes = "Returns downloaded artifact", response = String.class) @ApiResponses(value = { @ApiResponse(code = 200, message = "The artifact is found and streamed.", response = String.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Specified Service is not found - SVC4503"), @@ -177,7 +177,7 @@ public class DistributionCatalogServlet extends BeGenericServlet { @ApiOperation(value = "Download resource artifact", httpMethod = "GET", notes = "Returns downloaded artifact", response = String.class) @ApiResponses(value = { @ApiResponse(code = 200, message = "The artifact is found and streamed.", response = String.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Specified Service is not found - SVC4503"), @@ -258,7 +258,7 @@ public class DistributionCatalogServlet extends BeGenericServlet { @ApiOperation(value = "Download resource instance artifact", httpMethod = "GET", notes = "Returns downloaded artifact", response = String.class) @ApiResponses(value = { @ApiResponse(code = 200, message = "The artifact is found and streamed.", response = String.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Specified Service is not found - SVC4503"), diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionServlet.java index ab760218a7..71e97f79bd 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionServlet.java @@ -106,7 +106,7 @@ public class DistributionServlet extends BeGenericServlet { @ResponseHeader(name = "Content-Length", description = "Length of the response body", response = String.class)}) @ApiResponses(value = { @ApiResponse(code = 200, message = "ECOMP component is authenticated and list of Cambria API server’s FQDNs is returned", response = ServerListResponse.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its credentials for Basic Authentication - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"), @@ -174,11 +174,11 @@ public class DistributionServlet extends BeGenericServlet { @ApiOperation(value = "Subscription status", httpMethod = "POST", notes = "Subscribes for distribution notifications") @ApiResponses(value = { @ApiResponse(code = 200, message = "ECOMP component is successfully registered for distribution", response = TopicRegistrationResponse.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 400, message = "Missing Body - POL4500"), - @ApiResponse(code = 400, message = "Invalid Body : missing mandatory parameter “apiPublicKey” - POL4501"), - @ApiResponse(code = 400, message = "Invalid Body : missing mandatory parameter “distrEnvName” - POL4502"), - @ApiResponse(code = 400, message = "Invalid Body : Specified “distrEnvName” doesn’t exist - POL4137"), + @ApiResponse(code = 400, message = "Invalid Body : missing mandatory parameter 'apiPublicKey' - POL4501"), + @ApiResponse(code = 400, message = "Invalid Body : missing mandatory parameter 'distrEnvName' - POL4502"), + @ApiResponse(code = 400, message = "Invalid Body : Specified 'distrEnvName' doesn’t exist - POL4137"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 405, message = "Method Not Allowed : Invalid HTTP method type used to register for distribution ( PUT,DELETE,GET will be rejected) - POL4050"), @@ -236,7 +236,7 @@ public class DistributionServlet extends BeGenericServlet { @ApiOperation(value = "Artifact types list", httpMethod = "GET", notes = "Fetches available artifact types list") @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact types list fetched successfully", response = String.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 405, message = "Method Not Allowed : Invalid HTTP method type used to register for distribution ( POST,PUT,DELETE will be rejected) - POL4050"), @@ -282,11 +282,11 @@ public class DistributionServlet extends BeGenericServlet { //TODO Edit the responses @ApiResponses(value = { @ApiResponse(code = 204, message = "ECOMP component is successfully unregistered", response = TopicUnregistrationResponse.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 400, message = "Missing Body - POL4500"), - @ApiResponse(code = 400, message = "Invalid Body : missing mandatory parameter “apiPublicKey” - POL4501"), - @ApiResponse(code = 400, message = "Invalid Body : missing mandatory parameter “distrEnvName” - SVC4506"), - @ApiResponse(code = 400, message = "Invalid Body : Specified “distrEnvName” doesn’t exist - POL4137"), + @ApiResponse(code = 400, message = "Invalid Body : missing mandatory parameter 'apiPublicKey' - POL4501"), + @ApiResponse(code = 400, message = "Invalid Body : missing mandatory parameter 'distrEnvName' - SVC4506"), + @ApiResponse(code = 400, message = "Invalid Body : Specified 'distrEnvName' doesn’t exist - POL4137"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 405, message = "Method Not Allowed : Invalid HTTP method type used to register for distribution ( PUT,DELETE,GET will be rejected) - POL4050"), diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ArtifactExternalServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ArtifactExternalServlet.java index 74eea8b3ec..32293ca9b7 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ArtifactExternalServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ArtifactExternalServlet.java @@ -107,7 +107,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet { @ApiOperation(value = "uploads of artifact to a resource or service", httpMethod = "POST", notes = "uploads of artifact to a resource or service") @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact uploaded", response = ArtifactDefinition.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"), @@ -199,7 +199,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet { @ApiOperation(value = "uploads an artifact to a resource instance", httpMethod = "POST", notes = "uploads an artifact to a resource instance") @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact uploaded", response = ArtifactDefinition.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"), @@ -300,7 +300,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet { @ApiOperation(value = "updates an artifact on a resource or service", httpMethod = "POST", notes = "uploads of artifact to a resource or service") @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact updated", response = ArtifactDefinition.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"), @@ -394,7 +394,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet { @ApiOperation(value = "updates an artifact on a resource instance", httpMethod = "POST", notes = "uploads of artifact to a resource or service") @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact updated", response = ArtifactDefinition.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"), @@ -491,7 +491,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet { @ApiResponse(code = 404, message = "Asset not found") })*/ @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact deleted", response = ArtifactDefinition.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"), @@ -580,7 +580,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet { @ApiOperation(value = "deletes an artifact of a resource insatnce", httpMethod = "DELETE", notes = "deletes an artifact of a resource insatnce", response = Response.class) @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact deleted", response = ArtifactDefinition.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"), @@ -671,7 +671,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet { @ApiOperation(value = "Download component artifact", httpMethod = "GET", notes = "Returns downloaded artifact") @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact downloaded", response = String.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"), @@ -750,7 +750,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet { @ApiOperation(value = "Download resource instance artifact", httpMethod = "GET", notes = "Returns downloaded artifact", response = Response.class) @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact downloaded", response = String.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"), diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java index ce8b967786..c3708d4017 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java @@ -107,7 +107,7 @@ public class AssetsDataServlet extends AbstractValidationsServlet { @ApiOperation(value = "Fetch list of assets", httpMethod = "GET", notes = "Returns list of assets") @ApiResponses(value = { @ApiResponse(code = 200, message = "ECOMP component is authenticated and list of Catalog Assets Metadata is returned", response = AssetMetadata.class, responseContainer="List"), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 405, message = "Method Not Allowed : Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"), @@ -217,7 +217,7 @@ public class AssetsDataServlet extends AbstractValidationsServlet { @ApiOperation(value = "Detailed metadata of asset by uuid", httpMethod = "GET", notes = "Returns detailed metadata of an asset by uuid") @ApiResponses(value = { @ApiResponse(code = 200, message = "ECOMP component is authenticated and list of Catalog Assets Metadata is returned", response = AssetMetadata.class, responseContainer="List"), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Error: Requested '%1' (uuid) resource was not found - SVC4063"), @@ -306,7 +306,7 @@ public class AssetsDataServlet extends AbstractValidationsServlet { @ApiOperation(value = "Fetch assets CSAR", httpMethod = "GET", notes = "Returns asset csar", response = String.class) @ApiResponses(value = { @ApiResponse(code = 200, message = "ECOMP component is authenticated and list of Catalog Assets Metadata is returned", response = String.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing 'X-ECOMP-InstanceID' HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Error: Requested '%1' (uuid) resource was not found - SVC4063"), diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java index b88fa903b1..529d2aba4d 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.externalapi.servlet; import java.io.IOException; @@ -100,7 +120,7 @@ public class CrudExternalServlet extends AbstractValidationsServlet { @ApiOperation(value = "creates a resource", httpMethod = "POST", notes = "Creates a resource") @ApiResponses(value = { @ApiResponse(code = 200, message = "ECOMP component is authenticated and Asset created", response = Resource.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing X-ECOMP-InstanceID HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Error: Requested '%1' (uuid) resource was not found - SVC4063"), @@ -249,7 +269,7 @@ public class CrudExternalServlet extends AbstractValidationsServlet { @ApiOperation(value = "Change Resource lifecycle State", httpMethod = "POST") @ApiResponses(value = { @ApiResponse(code = 200, message = "Resource state changed", response = AssetMetadata.class), - @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"), + @ApiResponse(code = 400, message = "Missing X-ECOMP-InstanceID HTTP header - POL5001"), @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"), @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"), @ApiResponse(code = 404, message = "Error: Requested '%1' (uuid) resource was not found - SVC4063"), diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabiltyRequirementConvertor.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabiltyRequirementConvertor.java index b21e064a82..3fd5297439 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabiltyRequirementConvertor.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabiltyRequirementConvertor.java @@ -122,7 +122,7 @@ public class CapabiltyRequirementConvertor { if (prop.getSchema() != null && prop.getSchema().getProperty() != null) { innerType = prop.getSchema().getProperty().getType(); } - Object convertedValue = PropertyConvertor.getInstance().convertToToscaObject(propertyType, prop.getValue(), innerType, dataTypes); + Object convertedValue = PropertyConvertor.getInstance().convertToToscaObject(propertyType, prop.getName(), prop.getValue(), innerType, dataTypes); return convertedValue; } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PropertyConvertor.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PropertyConvertor.java index af3b73dc97..0804ef1ed4 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PropertyConvertor.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PropertyConvertor.java @@ -24,7 +24,9 @@ import java.io.StringReader; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; +import org.apache.commons.lang3.StringUtils; import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition; import org.openecomp.sdc.be.model.Component; import org.openecomp.sdc.be.model.DataTypeDefinition; @@ -39,7 +41,9 @@ import org.openecomp.sdc.be.tosca.model.ToscaProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.gson.Gson; import com.google.gson.JsonElement; +import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.JsonSyntaxException; import com.google.gson.stream.JsonReader; @@ -50,7 +54,7 @@ public class PropertyConvertor { private static PropertyConvertor instance; private JsonParser jsonParser = new JsonParser(); private static Logger log = LoggerFactory.getLogger(PropertyConvertor.class.getName()); - + Gson gson = new Gson(); protected PropertyConvertor() { } @@ -97,7 +101,7 @@ public class PropertyConvertor { prop.setEntry_schema(eschema); } log.debug("try to convert property {} from type {} with default value {}", property.getName(), property.getType(), property.getDefaultValue()); - prop.setDefaultp(convertToToscaObject(property.getType(), property.getDefaultValue(), innerType, dataTypes)); + prop.setDefaultp(convertToToscaObject(property.getType(), property.getName(), property.getDefaultValue(), innerType, dataTypes)); prop.setType(property.getType()); prop.setDescription(property.getDescription()); if (isCapabiltyProperty) { @@ -107,10 +111,13 @@ public class PropertyConvertor { return prop; } - public Object convertToToscaObject(String propertyType, String value, String innerType, Map dataTypes) { + public Object convertToToscaObject(String propertyType, String propertyName, String value, String innerType, Map dataTypes) { log.debug("try to convert propertyType {} , value {}, innerType {}", propertyType, value, innerType); if (value == null) { - return value; + value = getDataTypeDefaultValue(propertyName, dataTypes.get(propertyType)); + if(StringUtils.isEmpty(value)){ + return null; + } } ToscaMapValueConverter mapConverterInst = ToscaMapValueConverter.getInstance(); @@ -185,4 +192,35 @@ public class PropertyConvertor { } + private String getDataTypeDefaultValue(String propertyName, DataTypeDefinition dataTypeDefinition) { + + String delaultValue = null; + JsonObject asJsonObjectIn = new JsonObject(); + Map allParentsProps = new HashMap<>(); + while (dataTypeDefinition != null) { + + List currentParentsProps = dataTypeDefinition.getProperties(); + if (currentParentsProps != null) { + currentParentsProps.stream().forEach(p -> allParentsProps.put(p.getName(), p)); + } + + dataTypeDefinition = dataTypeDefinition.getDerivedFrom(); + } + for (Entry entry : allParentsProps.entrySet()) { + String propName = entry.getKey(); + PropertyDefinition propertyDefinition = entry.getValue(); + JsonElement elementValue = asJsonObjectIn.get(propName); + if(elementValue == null && propertyDefinition.getDefaultValue() != null){ + JsonReader jsonReader = new JsonReader(new StringReader(propertyDefinition.getDefaultValue())); + jsonReader.setLenient(true); + elementValue = jsonParser.parse(jsonReader); + asJsonObjectIn.add(propName, elementValue); + } + } + if(!asJsonObjectIn.isJsonNull()){ + delaultValue = gson.toJson(asJsonObjectIn); + } + return delaultValue; + } + } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java index 65e4266d6d..d6f87967ca 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java @@ -644,8 +644,6 @@ public class ToscaExportHandler { if (!MapUtils.isEmpty(componentInstancesProperties)) { componentInstancesProperties.get(instanceUniqueId).stream() - // Filters out properties with empty ValueUniqueUid - .filter(e -> e.getValue() != null && !e.getValue().isEmpty() ) // Collects filtered properties to List .collect(Collectors.toList()).stream() // Converts and adds each value to property map @@ -694,7 +692,7 @@ public class ToscaExportHandler { if (input.getSchema() != null && input.getSchema().getProperty() != null) { innerType = input.getSchema().getProperty().getType(); } - return propertyConvertor.convertToToscaObject(propertyType, supplier.get(), innerType, dataTypes); + return propertyConvertor.convertToToscaObject(propertyType, input.getName(), supplier.get(), innerType, dataTypes); } private ToscaGroupTemplate convertGroup(GroupDefinition group) { diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactResolverTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactResolverTest.java index 1ff6f853d9..a325817316 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactResolverTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactResolverTest.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.components.impl; import org.junit.Before; diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogicTest.java index 97b425db05..db5531debf 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogicTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogicTest.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.components.impl; import fj.data.Either; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/DAOTitanStrategy.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/DAOTitanStrategy.java index c005192f71..2452245616 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/DAOTitanStrategy.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/DAOTitanStrategy.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao; import org.openecomp.sdc.be.config.ConfigurationManager; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/TitanClientStrategy.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/TitanClientStrategy.java index 772211ca58..36aaec8684 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/TitanClientStrategy.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/TitanClientStrategy.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao; public interface TitanClientStrategy { diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesAccessor.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesAccessor.java index 1168bf4edf..f9505fc027 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesAccessor.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesAccessor.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.cassandra; import org.openecomp.sdc.be.resources.data.SdcSchemaFilesData; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesCassandraDao.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesCassandraDao.java index d292c1ddeb..de14bac210 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesCassandraDao.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesCassandraDao.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.cassandra; import java.util.List; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java index f52faa5886..56cf32a152 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.cassandra.schema; import com.datastax.driver.core.*; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OldExternalApiEventTableDesc.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OldExternalApiEventTableDesc.java index b075f0ef4e..7459a4b5d9 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OldExternalApiEventTableDesc.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OldExternalApiEventTableDesc.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.cassandra.schema.tables; import java.util.ArrayList; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/SdcSchemaFilesTableDescription.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/SdcSchemaFilesTableDescription.java index 09a01fb962..6235fb7843 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/SdcSchemaFilesTableDescription.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/SdcSchemaFilesTableDescription.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.cassandra.schema.tables; import java.util.ArrayList; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/DAOSpringConfig.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/DAOSpringConfig.java index d9c6829079..c5f066bb4b 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/DAOSpringConfig.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/DAOSpringConfig.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.config; import org.openecomp.sdc.be.dao.DAOTitanStrategy; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertex.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertex.java index 67cbd258f4..6966abb1c9 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertex.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertex.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.jsongraph; import java.util.HashMap; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/TitanDao.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/TitanDao.java index 61e1b40d46..2d9c029ea9 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/TitanDao.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/TitanDao.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.jsongraph; import java.io.IOException; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgeLabelEnum.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgeLabelEnum.java index 6f5910f581..001544c4a4 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgeLabelEnum.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgeLabelEnum.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.jsongraph.types; public enum EdgeLabelEnum { diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgePropertyEnum.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgePropertyEnum.java index df2f52040d..e52c92e74b 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgePropertyEnum.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgePropertyEnum.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.jsongraph.types; public enum EdgePropertyEnum { diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/GraphJsonProperty.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/GraphJsonProperty.java index c54825a39e..c9120bbcf7 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/GraphJsonProperty.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/GraphJsonProperty.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.jsongraph.types; import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/JsonParseFlagEnum.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/JsonParseFlagEnum.java index aea488e086..485531aa52 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/JsonParseFlagEnum.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/JsonParseFlagEnum.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.jsongraph.types; public enum JsonParseFlagEnum { diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/VertexTypeEnum.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/VertexTypeEnum.java index cb9c7207d2..c3e88c85bf 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/VertexTypeEnum.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/VertexTypeEnum.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.jsongraph.types; import org.openecomp.sdc.be.datatypes.elements.*; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/utils/IdBuilderUtils.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/utils/IdBuilderUtils.java index dfff258840..f4aff17ce6 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/utils/IdBuilderUtils.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/utils/IdBuilderUtils.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.jsongraph.utils; import java.util.UUID; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/utils/JsonParserUtils.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/utils/JsonParserUtils.java index a7fe34071d..da3d6530e4 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/utils/JsonParserUtils.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/utils/JsonParserUtils.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.jsongraph.utils; import java.io.IOException; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/neo4j/GraphPropertiesDictionary.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/neo4j/GraphPropertiesDictionary.java index 2ff1567928..86a171633d 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/neo4j/GraphPropertiesDictionary.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/neo4j/GraphPropertiesDictionary.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.dao.neo4j; import java.util.ArrayList; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesData.java index 96ab5aedc8..3454a882d2 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesData.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.resources.data; import java.nio.ByteBuffer; diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/JsonParserUtilsTests.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/JsonParserUtilsTests.java index c0c49b7b13..18254ac54c 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/JsonParserUtilsTests.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/JsonParserUtilsTests.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.resources; import java.io.IOException; diff --git a/catalog-fe/src/main/webapp/WEB-INF/web.xml b/catalog-fe/src/main/webapp/WEB-INF/web.xml index ffbcb1d3d6..9c81055652 100644 --- a/catalog-fe/src/main/webapp/WEB-INF/web.xml +++ b/catalog-fe/src/main/webapp/WEB-INF/web.xml @@ -101,7 +101,7 @@ GzipFilter - /* + /sdc1/* diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/DerivedNodeTypeResolver.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/DerivedNodeTypeResolver.java index fff3e81d7a..f841fcb6da 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/DerivedNodeTypeResolver.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/DerivedNodeTypeResolver.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model; import fj.data.Either; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeType.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeType.java index c1b4129afc..c6157ba252 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeType.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeType.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.datamodel; import java.util.List; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplate.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplate.java index 5b236e4b84..663b5bf6df 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplate.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplate.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.datamodel; import java.util.HashMap; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElement.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElement.java index 72cf89f13c..90b32c6165 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElement.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElement.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.datamodel; import java.util.HashMap; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnum.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnum.java index 7a8f76e511..1dc7532c1c 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnum.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnum.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.datamodel; import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnum.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnum.java index 12ff27fa70..0a10a3a4e3 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnum.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnum.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.enums; public enum JsonConstantKeysEnum { diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperations.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperations.java index 224697246d..e2766b1092 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperations.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperations.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; import java.util.ArrayList; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/BaseOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/BaseOperation.java index d29f989149..69ac568ee9 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/BaseOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/BaseOperation.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; import java.util.ArrayList; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ByToscaNameDerivedNodeTypeResolver.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ByToscaNameDerivedNodeTypeResolver.java index 8fe70f02b1..1afb43c132 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ByToscaNameDerivedNodeTypeResolver.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ByToscaNameDerivedNodeTypeResolver.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; import fj.data.Either; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CategoryOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CategoryOperation.java index 898dec03a8..5b7022989c 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CategoryOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CategoryOperation.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; import java.util.HashMap; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/GroupsOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/GroupsOperation.java index 97a5e11a13..737c1c2d40 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/GroupsOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/GroupsOperation.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; import java.util.ArrayList; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/InstancesOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/InstancesOperation.java index b5154a7a0f..84814e4863 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/InstancesOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/InstancesOperation.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; public class InstancesOperation extends BaseOperation { diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperation.java index 0bb5476f1d..29247996a5 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperation.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; import java.util.ArrayList; @@ -602,18 +622,20 @@ public class NodeTemplateOperation extends BaseOperation { public MapArtifactDataDefinition prepareInstDeploymentArtifactPerInstance(Map deploymentArtifacts, String componentInstanceId, User user, String envType) { if (deploymentArtifacts != null && envType.equals(HEAT_VF_ENV_NAME)) { + Map instDeploymentArtifacts = new HashMap<>(); deploymentArtifacts.entrySet().forEach(e -> { ArtifactDataDefinition artifact = e.getValue(); String type = artifact.getArtifactType(); if (type.equalsIgnoreCase(ArtifactTypeEnum.HEAT.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.HEAT_NET.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.HEAT_VOL.getType())) { - //instDeploymentArtifacts.put(e.getKey(), artifact); ArtifactDataDefinition artifactEnv = createArtifactPlaceHolderInfo(artifact, componentInstanceId, user, envType); - deploymentArtifacts.put(artifactEnv.getArtifactLabel(), artifactEnv); + instDeploymentArtifacts.put(artifactEnv.getArtifactLabel(), artifactEnv); } }); - + + deploymentArtifacts.putAll(instDeploymentArtifacts); MapArtifactDataDefinition instArtifacts = new MapArtifactDataDefinition(deploymentArtifacts); + return instArtifacts; } return null; @@ -845,8 +867,10 @@ public class NodeTemplateOperation extends BaseOperation { dataDefinition.setComponentVersion((String) originToscaElement.getMetadataValue(JsonPresentationFields.VERSION)); if (StringUtils.isEmpty(dataDefinition.getComponentName()) && originToscaElement != null) dataDefinition.setComponentName((String) originToscaElement.getMetadataValue(JsonPresentationFields.NAME)); - if (StringUtils.isEmpty(dataDefinition.getToscaComponentName()) && originToscaElement != null) - dataDefinition.setToscaComponentName((String) originToscaElement.getMetadataValue(JsonPresentationFields.TOSCA_RESOURCE_NAME)); +// if (StringUtils.isEmpty(dataDefinition.getToscaComponentName()) && originToscaElement != null) + + dataDefinition.setToscaComponentName((String) originToscaElement.getMetadataValue(JsonPresentationFields.TOSCA_RESOURCE_NAME)); + if (dataDefinition.getOriginType() == null && originToscaElement != null) { ResourceTypeEnum resourceType = originToscaElement.getResourceType(); OriginTypeEnum originType = null; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTypeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTypeOperation.java index 8718f72f8a..d52aa038a3 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTypeOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTypeOperation.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; import fj.data.Either; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/TopologyTemplateOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/TopologyTemplateOperation.java index 0389c2739a..99a602f234 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/TopologyTemplateOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/TopologyTemplateOperation.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; import java.lang.reflect.Type; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaDataOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaDataOperation.java index 27b296d3f2..f30a4d9159 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaDataOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaDataOperation.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; import org.slf4j.Logger; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementLifecycleOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementLifecycleOperation.java index ca0a51cbbc..d57e7cc255 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementLifecycleOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementLifecycleOperation.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; import java.util.ArrayList; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperation.java index 699d9e0e9d..99cbd34c9b 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperation.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; import java.lang.reflect.Type; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java index 58b7d30252..8999340f0a 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.operations; import java.util.*; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/ModelConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/ModelConverter.java index e6f9ff6f93..0ac5a8dbe4 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/ModelConverter.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/ModelConverter.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.jsontitan.utils; import java.util.ArrayList; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ToscaDefinitionPathCalculator.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ToscaDefinitionPathCalculator.java index f64d4c9091..2a5893951a 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ToscaDefinitionPathCalculator.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ToscaDefinitionPathCalculator.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.operations.api; import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ToscaDefinitionPathCalculatorImpl.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ToscaDefinitionPathCalculatorImpl.java index 01a730a052..5674a6ef0c 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ToscaDefinitionPathCalculatorImpl.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ToscaDefinitionPathCalculatorImpl.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.operations.impl; import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/migration/MigrationMalformedDataLogger.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/migration/MigrationMalformedDataLogger.java index 2e5e520af0..3cbdfc798c 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/migration/MigrationMalformedDataLogger.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/migration/MigrationMalformedDataLogger.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.operations.migration; import org.apache.commons.lang3.StringUtils; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverter.java index 14f63650ac..c40c59facf 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverter.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverter.java @@ -189,12 +189,25 @@ public class ToscaMapValueConverter extends ToscaValueBaseConverter implements T final boolean isScalarF, JsonElement entryValue) { Object convertedValue; JsonObject asJsonObjectIn = entryValue.getAsJsonObject(); - Set> entrySetIn = asJsonObjectIn.entrySet(); DataTypeDefinition dataTypeDefinition = dataTypes.get(innerType); Map allProperties = getAllProperties(dataTypeDefinition); Map toscaObjectPresentation = new HashMap<>(); + for (Entry entry : allProperties.entrySet()) { + String propName = entry.getKey(); + PropertyDefinition propertyDefinition = entry.getValue(); + JsonElement elementValue = asJsonObjectIn.get(propName); + if(elementValue == null && propertyDefinition.getDefaultValue() != null){ + JsonReader jsonReader = new JsonReader(new StringReader(propertyDefinition.getDefaultValue())); + jsonReader.setLenient(true); + elementValue = jsonParser.parse(jsonReader); + asJsonObjectIn.add(propName, elementValue); + } + } + + Set> entrySetIn = asJsonObjectIn.entrySet(); + for (Entry entry : entrySetIn) { String propName = entry.getKey(); diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiCategories.java b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiCategories.java index 75ad6c3794..cda23cb92e 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiCategories.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiCategories.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.ui.model; import java.util.List; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiComponentDataTransfer.java b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiComponentDataTransfer.java index 36b6c574aa..6ebb32e7f5 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiComponentDataTransfer.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiComponentDataTransfer.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.ui.model; import java.util.List; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiComponentMetadata.java b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiComponentMetadata.java index 6dabfc1402..dfc4c8c994 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiComponentMetadata.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiComponentMetadata.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.ui.model; import java.util.List; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiResourceDataTransfer.java b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiResourceDataTransfer.java index 2547457abc..5eef21b3a5 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiResourceDataTransfer.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiResourceDataTransfer.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.ui.model; import java.util.List; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiResourceMetadata.java b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiResourceMetadata.java index 3675bc619c..a2695f8c79 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiResourceMetadata.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiResourceMetadata.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.ui.model; import java.util.List; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiServiceDataTransfer.java b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiServiceDataTransfer.java index 73bb772a51..757dccf5d9 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiServiceDataTransfer.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiServiceDataTransfer.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.ui.model; import java.util.Map; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiServiceMetadata.java b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiServiceMetadata.java index 96671766eb..99d586afd2 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiServiceMetadata.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiServiceMetadata.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.ui.model; import java.util.List; diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaDefinitionPathCalculatorTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaDefinitionPathCalculatorTest.java index 9aa0842bb3..069282367f 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaDefinitionPathCalculatorTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaDefinitionPathCalculatorTest.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.operations.impl; import org.junit.Before; diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java index 103d430009..f7072b2868 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.model.operations.impl; import static org.junit.Assert.assertEquals; diff --git a/catalog-ui/src/app/app.ts b/catalog-ui/src/app/app.ts index 305327cb95..50b99e8ab9 100644 --- a/catalog-ui/src/app/app.ts +++ b/catalog-ui/src/app/app.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; //import 'restangular'; diff --git a/catalog-ui/src/app/directives/capabilities-and-requirements/capabilities-requirements-list.less b/catalog-ui/src/app/directives/capabilities-and-requirements/capabilities-requirements-list.less index 0860261b97..3b6d30d7b9 100644 --- a/catalog-ui/src/app/directives/capabilities-and-requirements/capabilities-requirements-list.less +++ b/catalog-ui/src/app/directives/capabilities-and-requirements/capabilities-requirements-list.less @@ -101,7 +101,7 @@ } .i-sdc-designer-sidebar-section-content-item-relations-details-desc-label { - font-family: omnes-medium, sans-serif; + font-family: @font-opensans-medium; } .i-sdc-designer-sidebar-section-content-item-relations-view { diff --git a/catalog-ui/src/app/directives/capabilities-and-requirements/capability/capabilities-list-directive.ts b/catalog-ui/src/app/directives/capabilities-and-requirements/capability/capabilities-list-directive.ts index e71478fa4d..582f6e7df6 100644 --- a/catalog-ui/src/app/directives/capabilities-and-requirements/capability/capabilities-list-directive.ts +++ b/catalog-ui/src/app/directives/capabilities-and-requirements/capability/capabilities-list-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by ob0695 on 5/9/2017. */ diff --git a/catalog-ui/src/app/directives/capabilities-and-requirements/requirement/requirements-list-directive.ts b/catalog-ui/src/app/directives/capabilities-and-requirements/requirement/requirements-list-directive.ts index 9863b5d271..1c5c333d27 100644 --- a/catalog-ui/src/app/directives/capabilities-and-requirements/requirement/requirements-list-directive.ts +++ b/catalog-ui/src/app/directives/capabilities-and-requirements/requirement/requirements-list-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by ob0695 on 5/9/2017. */ diff --git a/catalog-ui/src/app/directives/clicked-outside/clicked-outside-directive.ts b/catalog-ui/src/app/directives/clicked-outside/clicked-outside-directive.ts index 009e104740..94f4643060 100644 --- a/catalog-ui/src/app/directives/clicked-outside/clicked-outside-directive.ts +++ b/catalog-ui/src/app/directives/clicked-outside/clicked-outside-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + class ClickedOutsideModel { private clickedOutsideContainerSelector:string; diff --git a/catalog-ui/src/app/directives/custom-validation/custom-validation.ts b/catalog-ui/src/app/directives/custom-validation/custom-validation.ts index e35a747e1b..d1576f116e 100644 --- a/catalog-ui/src/app/directives/custom-validation/custom-validation.ts +++ b/catalog-ui/src/app/directives/custom-validation/custom-validation.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface ICustomValidationScope extends ng.IScope { validationFunc:Function; diff --git a/catalog-ui/src/app/directives/download-artifact/download-artifact.ts b/catalog-ui/src/app/directives/download-artifact/download-artifact.ts index 7c817935cf..deeb1f55d8 100644 --- a/catalog-ui/src/app/directives/download-artifact/download-artifact.ts +++ b/catalog-ui/src/app/directives/download-artifact/download-artifact.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IFileDownload, Component, ArtifactModel} from "app/models"; import {EventListenerService, CacheService} from "app/services"; diff --git a/catalog-ui/src/app/directives/ecomp-footer/ecomp-footer.ts b/catalog-ui/src/app/directives/ecomp-footer/ecomp-footer.ts index f104926fc6..7796f60d70 100644 --- a/catalog-ui/src/app/directives/ecomp-footer/ecomp-footer.ts +++ b/catalog-ui/src/app/directives/ecomp-footer/ecomp-footer.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IAppConfigurtaion} from "app/models"; diff --git a/catalog-ui/src/app/directives/ecomp-header/ecomp-header.ts b/catalog-ui/src/app/directives/ecomp-header/ecomp-header.ts index ba96e80484..7d616afba6 100644 --- a/catalog-ui/src/app/directives/ecomp-header/ecomp-header.ts +++ b/catalog-ui/src/app/directives/ecomp-header/ecomp-header.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IAppConfigurtaion, User, IUser} from "app/models"; import {IUserResourceClass, IUserResource} from "app/services"; diff --git a/catalog-ui/src/app/directives/edit-name-popover/edit-name-popover-directive.ts b/catalog-ui/src/app/directives/edit-name-popover/edit-name-popover-directive.ts index b99f11fcf9..0a1ea4a374 100644 --- a/catalog-ui/src/app/directives/edit-name-popover/edit-name-popover-directive.ts +++ b/catalog-ui/src/app/directives/edit-name-popover/edit-name-popover-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IEditNamePopoverDirectiveScope extends ng.IScope { diff --git a/catalog-ui/src/app/directives/edit-name-popover/edit-name-popover.less b/catalog-ui/src/app/directives/edit-name-popover/edit-name-popover.less index 55dcd80a27..2beb0b8773 100644 --- a/catalog-ui/src/app/directives/edit-name-popover/edit-name-popover.less +++ b/catalog-ui/src/app/directives/edit-name-popover/edit-name-popover.less @@ -25,7 +25,7 @@ margin-left: 20px; margin-right: 20px; padding: 8px 14px 8px 0px; - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-weight: bold; } @@ -64,7 +64,7 @@ display: block; white-space: nowrap; margin-bottom: 10px; - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; color: @main_color_l; } diff --git a/catalog-ui/src/app/directives/elements/checkbox/checkbox.ts b/catalog-ui/src/app/directives/elements/checkbox/checkbox.ts index ec0be8ab07..43a05e77d4 100644 --- a/catalog-ui/src/app/directives/elements/checkbox/checkbox.ts +++ b/catalog-ui/src/app/directives/elements/checkbox/checkbox.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface ICheckboxElementScope extends ng.IScope { diff --git a/catalog-ui/src/app/directives/elements/radiobutton/radiobutton.ts b/catalog-ui/src/app/directives/elements/radiobutton/radiobutton.ts index 1384a82674..565c778daf 100644 --- a/catalog-ui/src/app/directives/elements/radiobutton/radiobutton.ts +++ b/catalog-ui/src/app/directives/elements/radiobutton/radiobutton.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import INgModelController = angular.INgModelController; 'use strict'; diff --git a/catalog-ui/src/app/directives/ellipsis/ellipsis-directive.ts b/catalog-ui/src/app/directives/ellipsis/ellipsis-directive.ts index 8fbbd4d486..60baf3e183 100644 --- a/catalog-ui/src/app/directives/ellipsis/ellipsis-directive.ts +++ b/catalog-ui/src/app/directives/ellipsis/ellipsis-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IEllipsisScope extends ng.IScope { ellipsis:string; diff --git a/catalog-ui/src/app/directives/events/on-last-repeat/on-last-repeat.ts b/catalog-ui/src/app/directives/events/on-last-repeat/on-last-repeat.ts index 84014159f0..edfc04eba4 100644 --- a/catalog-ui/src/app/directives/events/on-last-repeat/on-last-repeat.ts +++ b/catalog-ui/src/app/directives/events/on-last-repeat/on-last-repeat.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; /** diff --git a/catalog-ui/src/app/directives/export-json-to-excel/export-json-to-excel.ts b/catalog-ui/src/app/directives/export-json-to-excel/export-json-to-excel.ts index deb1c94936..c4800fc0b4 100644 --- a/catalog-ui/src/app/directives/export-json-to-excel/export-json-to-excel.ts +++ b/catalog-ui/src/app/directives/export-json-to-excel/export-json-to-excel.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {FileUtils} from "app/utils"; diff --git a/catalog-ui/src/app/directives/file-opener/file-opener.ts b/catalog-ui/src/app/directives/file-opener/file-opener.ts index 95e43262f5..c09d6fc553 100644 --- a/catalog-ui/src/app/directives/file-opener/file-opener.ts +++ b/catalog-ui/src/app/directives/file-opener/file-opener.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IFileOpenerScope extends ng.IScope { diff --git a/catalog-ui/src/app/directives/file-type/file-type.ts b/catalog-ui/src/app/directives/file-type/file-type.ts index 11795724d0..867a40c561 100644 --- a/catalog-ui/src/app/directives/file-type/file-type.ts +++ b/catalog-ui/src/app/directives/file-type/file-type.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export class FileTypeDirective implements ng.IDirective { diff --git a/catalog-ui/src/app/directives/file-upload/file-upload.ts b/catalog-ui/src/app/directives/file-upload/file-upload.ts index 63a6f08062..5a8fd87849 100644 --- a/catalog-ui/src/app/directives/file-upload/file-upload.ts +++ b/catalog-ui/src/app/directives/file-upload/file-upload.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 1/27/2016. */ diff --git a/catalog-ui/src/app/directives/graphs-v2/asset-popover/asset-popover.less b/catalog-ui/src/app/directives/graphs-v2/asset-popover/asset-popover.less index 44de4dfed1..1a113e5bdc 100644 --- a/catalog-ui/src/app/directives/graphs-v2/asset-popover/asset-popover.less +++ b/catalog-ui/src/app/directives/graphs-v2/asset-popover/asset-popover.less @@ -1,5 +1,5 @@ .assetPopover { - font-family: omnes-regular,sans-serif; + font-family: @font-opensans-regular; font-size: 13px; width:230px; padding:0 15px; @@ -30,7 +30,7 @@ .uib-custom-tooltip { margin-left:20px; - font-family: omnes-regular,sans-serif; + font-family: @font-opensans-regular; font-size: 13px; } diff --git a/catalog-ui/src/app/directives/graphs-v2/asset-popover/asset-popover.ts b/catalog-ui/src/app/directives/graphs-v2/asset-popover/asset-popover.ts index c560161d6e..ad3197c6da 100644 --- a/catalog-ui/src/app/directives/graphs-v2/asset-popover/asset-popover.ts +++ b/catalog-ui/src/app/directives/graphs-v2/asset-popover/asset-popover.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/directives/graphs-v2/common/common-graph-utils.ts b/catalog-ui/src/app/directives/graphs-v2/common/common-graph-utils.ts index 0b02173e9a..f88db47524 100644 --- a/catalog-ui/src/app/directives/graphs-v2/common/common-graph-utils.ts +++ b/catalog-ui/src/app/directives/graphs-v2/common/common-graph-utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {CommonNodeBase, CompositionCiLinkBase, RelationshipModel, Relationship, CompositionCiNodeBase, NodesFactory, LinksFactory} from "app/models"; import {GraphUIObjects} from "app/utils"; /** @@ -369,4 +389,4 @@ export class CommonGraphUtils { }; } -CommonGraphUtils.$inject = ['NodesFactory', 'LinksFactory']; \ No newline at end of file +CommonGraphUtils.$inject = ['NodesFactory', 'LinksFactory']; diff --git a/catalog-ui/src/app/directives/graphs-v2/common/style/component-instances-nodes-style.ts b/catalog-ui/src/app/directives/graphs-v2/common/style/component-instances-nodes-style.ts index 87acab6585..0a13ebd799 100644 --- a/catalog-ui/src/app/directives/graphs-v2/common/style/component-instances-nodes-style.ts +++ b/catalog-ui/src/app/directives/graphs-v2/common/style/component-instances-nodes-style.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {GraphColors} from "app/utils/constants"; import constant = require("lodash/constant"); import {ImagesUrl} from "app/utils/constants"; diff --git a/catalog-ui/src/app/directives/graphs-v2/common/style/module-node-style.ts b/catalog-ui/src/app/directives/graphs-v2/common/style/module-node-style.ts index 0c92c90538..bf71e1c868 100644 --- a/catalog-ui/src/app/directives/graphs-v2/common/style/module-node-style.ts +++ b/catalog-ui/src/app/directives/graphs-v2/common/style/module-node-style.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {GraphColors} from "app/utils"; export class ModulesNodesStyle { diff --git a/catalog-ui/src/app/directives/graphs-v2/composition-graph/composition-graph.directive.ts b/catalog-ui/src/app/directives/graphs-v2/composition-graph/composition-graph.directive.ts index b404a83634..651a4281fa 100644 --- a/catalog-ui/src/app/directives/graphs-v2/composition-graph/composition-graph.directive.ts +++ b/catalog-ui/src/app/directives/graphs-v2/composition-graph/composition-graph.directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { MatchBase, LinkMenu, diff --git a/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-general-utils.ts b/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-general-utils.ts index 1303e7a894..608031430b 100644 --- a/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-general-utils.ts +++ b/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-general-utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {ComponentInstance, Component, MatchReqToCapability, MatchBase, CompositionCiLinkBase, CompositionCiNodeUcpeCp} from "app/models"; import {QueueUtils, Dictionary, GraphUIObjects} from "app/utils"; import {LoaderService} from "app/services"; diff --git a/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-links-utils.ts b/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-links-utils.ts index 314c761edd..05f99ae9ea 100644 --- a/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-links-utils.ts +++ b/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-links-utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 6/28/2016. */ diff --git a/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-nodes-utils.ts b/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-nodes-utils.ts index 96afc8a4ea..feb6ac9a54 100644 --- a/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-nodes-utils.ts +++ b/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-nodes-utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Component, NodesFactory, ComponentInstance, CompositionCiNodeVl,IAppMenu,AssetPopoverObj} from "app/models"; import {EventListenerService, LoaderService} from "app/services"; import {GRAPH_EVENTS,ModalsHandler,GraphUIObjects} from "app/utils"; diff --git a/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-palette-utils.ts b/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-palette-utils.ts index 5285f46112..438673e427 100644 --- a/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-palette-utils.ts +++ b/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-palette-utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {EventListenerService, LoaderService} from "app/services"; import {CapabilitiesGroup, NodesFactory, ComponentInstance, Component, CompositionCiNodeBase, RequirementsGroup} from "app/models"; import {ComponentFactory, ComponentInstanceFactory, GRAPH_EVENTS, GraphUIObjects} from "app/utils"; diff --git a/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/match-capability-requierment-utils.ts b/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/match-capability-requierment-utils.ts index 0e21f033be..5f717512f5 100644 --- a/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/match-capability-requierment-utils.ts +++ b/catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/match-capability-requierment-utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Requirement, CompositionCiLinkBase, ComponentInstance, CapabilitiesGroup, RequirementsGroup, MatchReqToCapability, MatchBase, MatchReqToReq,CompositionCiNodeBase, Component, Capability} from "app/models"; /** diff --git a/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-graph.directive.ts b/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-graph.directive.ts index 3a0726f212..ace9d1ce4c 100644 --- a/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-graph.directive.ts +++ b/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-graph.directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, Module, NodesFactory, ComponentInstance } from "app/models"; import { ComponentInstanceFactory } from "app/utils"; import { DeploymentGraphGeneralUtils } from "./deployment-utils/deployment-graph-general-utils"; diff --git a/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-utils/deployment-graph-general-utils.ts b/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-utils/deployment-graph-general-utils.ts index 368455cb24..e481b1d268 100644 --- a/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-utils/deployment-graph-general-utils.ts +++ b/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-utils/deployment-graph-general-utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Module} from "app/models"; /** * Created by obarda on 12/21/2016. diff --git a/catalog-ui/src/app/directives/graphs-v2/image-creator/image-creator.service.ts b/catalog-ui/src/app/directives/graphs-v2/image-creator/image-creator.service.ts index 1bafb2f32b..51a77d1272 100644 --- a/catalog-ui/src/app/directives/graphs-v2/image-creator/image-creator.service.ts +++ b/catalog-ui/src/app/directives/graphs-v2/image-creator/image-creator.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export class ImageCreatorService { static '$inject' = ['$q']; diff --git a/catalog-ui/src/app/directives/graphs-v2/palette/palette.directive.ts b/catalog-ui/src/app/directives/graphs-v2/palette/palette.directive.ts index 0158a38253..f1c3405cfa 100644 --- a/catalog-ui/src/app/directives/graphs-v2/palette/palette.directive.ts +++ b/catalog-ui/src/app/directives/graphs-v2/palette/palette.directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, IAppMenu, diff --git a/catalog-ui/src/app/directives/graphs-v2/relation-menu/relation-menu.ts b/catalog-ui/src/app/directives/graphs-v2/relation-menu/relation-menu.ts index b05385b668..6106d10c4e 100644 --- a/catalog-ui/src/app/directives/graphs-v2/relation-menu/relation-menu.ts +++ b/catalog-ui/src/app/directives/graphs-v2/relation-menu/relation-menu.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/directives/info-tooltip/info-tooltip.ts b/catalog-ui/src/app/directives/info-tooltip/info-tooltip.ts index 63ecdc6091..f50890861b 100644 --- a/catalog-ui/src/app/directives/info-tooltip/info-tooltip.ts +++ b/catalog-ui/src/app/directives/info-tooltip/info-tooltip.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rcohen on 9/25/2016. */ diff --git a/catalog-ui/src/app/directives/inputs-and-properties/inputs/input-row-directive.ts b/catalog-ui/src/app/directives/inputs-and-properties/inputs/input-row-directive.ts index 221c20d08f..f951de988d 100644 --- a/catalog-ui/src/app/directives/inputs-and-properties/inputs/input-row-directive.ts +++ b/catalog-ui/src/app/directives/inputs-and-properties/inputs/input-row-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 1/8/2017. */ diff --git a/catalog-ui/src/app/directives/inputs-and-properties/properties/property-row-directive.ts b/catalog-ui/src/app/directives/inputs-and-properties/properties/property-row-directive.ts index a9ff71cda5..49d03483cd 100644 --- a/catalog-ui/src/app/directives/inputs-and-properties/properties/property-row-directive.ts +++ b/catalog-ui/src/app/directives/inputs-and-properties/properties/property-row-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 1/8/2017. */ diff --git a/catalog-ui/src/app/directives/invalid-characters/invalid-characters.ts b/catalog-ui/src/app/directives/invalid-characters/invalid-characters.ts index 20ed71e53f..881f9e02fc 100644 --- a/catalog-ui/src/app/directives/invalid-characters/invalid-characters.ts +++ b/catalog-ui/src/app/directives/invalid-characters/invalid-characters.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export class InvalidCharactersDirective implements ng.IDirective { diff --git a/catalog-ui/src/app/directives/layout/top-nav/top-nav.less b/catalog-ui/src/app/directives/layout/top-nav/top-nav.less index 65021bdc4d..13b4a525f4 100644 --- a/catalog-ui/src/app/directives/layout/top-nav/top-nav.less +++ b/catalog-ui/src/app/directives/layout/top-nav/top-nav.less @@ -56,9 +56,9 @@ }*/ a { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; color: @main_color_m; - font-size: 18px; + font-size: 16px; display: block; text-align: center; text-decoration: none; diff --git a/catalog-ui/src/app/directives/layout/top-nav/top-nav.ts b/catalog-ui/src/app/directives/layout/top-nav/top-nav.ts index c7208a909a..59e4d49647 100644 --- a/catalog-ui/src/app/directives/layout/top-nav/top-nav.ts +++ b/catalog-ui/src/app/directives/layout/top-nav/top-nav.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IAppConfigurtaion, IHostedApplication, IUserProperties} from "app/models"; import {IUserResourceClass} from "app/services"; diff --git a/catalog-ui/src/app/directives/layout/top-progress/top-progress.ts b/catalog-ui/src/app/directives/layout/top-progress/top-progress.ts index 06beb43ea1..9357b816e3 100644 --- a/catalog-ui/src/app/directives/layout/top-progress/top-progress.ts +++ b/catalog-ui/src/app/directives/layout/top-progress/top-progress.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface ITopProgressScope extends ng.IScope { diff --git a/catalog-ui/src/app/directives/loader/loader-directive.ts b/catalog-ui/src/app/directives/loader/loader-directive.ts index aa9c4b09c4..36efc22079 100644 --- a/catalog-ui/src/app/directives/loader/loader-directive.ts +++ b/catalog-ui/src/app/directives/loader/loader-directive.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/directives/modal/sdc-modal.ts b/catalog-ui/src/app/directives/modal/sdc-modal.ts index aedc28262f..f324e2187f 100644 --- a/catalog-ui/src/app/directives/modal/sdc-modal.ts +++ b/catalog-ui/src/app/directives/modal/sdc-modal.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface ISdcModalScope extends ng.IScope { diff --git a/catalog-ui/src/app/directives/perfect-scrollbar/angular-perfect-scrollbar.ts b/catalog-ui/src/app/directives/perfect-scrollbar/angular-perfect-scrollbar.ts index 914a7049bb..d236ed0115 100644 --- a/catalog-ui/src/app/directives/perfect-scrollbar/angular-perfect-scrollbar.ts +++ b/catalog-ui/src/app/directives/perfect-scrollbar/angular-perfect-scrollbar.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IPerfectScrollerScope extends ng.IScope { diff --git a/catalog-ui/src/app/directives/print-graph-screen/print-graph-screen.ts b/catalog-ui/src/app/directives/print-graph-screen/print-graph-screen.ts index a6e07eefee..8e285cfd70 100644 --- a/catalog-ui/src/app/directives/print-graph-screen/print-graph-screen.ts +++ b/catalog-ui/src/app/directives/print-graph-screen/print-graph-screen.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IAppMenu, Component, IAppConfigurtaion} from "app/models"; import {UrlToBase64Service} from "app/services"; diff --git a/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.ts b/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.ts index 2506dbe400..476f86d8a6 100644 --- a/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.ts +++ b/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 1/27/2016. */ diff --git a/catalog-ui/src/app/directives/property-types/type-list/type-list-directive.ts b/catalog-ui/src/app/directives/property-types/type-list/type-list-directive.ts index ac5da2be73..f2288cfd07 100644 --- a/catalog-ui/src/app/directives/property-types/type-list/type-list-directive.ts +++ b/catalog-ui/src/app/directives/property-types/type-list/type-list-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rcohen on 9/15/2016. */ diff --git a/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts b/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts index 03690b64f3..a2274654c8 100644 --- a/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts +++ b/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rcohen on 9/15/2016. */ diff --git a/catalog-ui/src/app/directives/punch-out/punch-out.ts b/catalog-ui/src/app/directives/punch-out/punch-out.ts index aa15f1f3e9..44c07ef688 100644 --- a/catalog-ui/src/app/directives/punch-out/punch-out.ts +++ b/catalog-ui/src/app/directives/punch-out/punch-out.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IUserProperties, IAppConfigurtaion} from "app/models"; let PunchOutRegistry = require('third-party/PunchOutRegistry.js'); diff --git a/catalog-ui/src/app/directives/sdc-tabs/sdc-single-tab/sdc-single-tab-directive.ts b/catalog-ui/src/app/directives/sdc-tabs/sdc-single-tab/sdc-single-tab-directive.ts index a41d9c59e4..67cbfdde3a 100644 --- a/catalog-ui/src/app/directives/sdc-tabs/sdc-single-tab/sdc-single-tab-directive.ts +++ b/catalog-ui/src/app/directives/sdc-tabs/sdc-single-tab/sdc-single-tab-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export class SdcSingleTabDirective implements ng.IDirective { diff --git a/catalog-ui/src/app/directives/sdc-tabs/sdc-tabs-directive.ts b/catalog-ui/src/app/directives/sdc-tabs/sdc-tabs-directive.ts index 1567bfba53..653e92c216 100644 --- a/catalog-ui/src/app/directives/sdc-tabs/sdc-tabs-directive.ts +++ b/catalog-ui/src/app/directives/sdc-tabs/sdc-tabs-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 7/28/2016. */ diff --git a/catalog-ui/src/app/directives/select-property-types/select-data-type-fields-structure/select-data-type-fields-structure.ts b/catalog-ui/src/app/directives/select-property-types/select-data-type-fields-structure/select-data-type-fields-structure.ts index aee4b3b6af..a8bcf3f155 100644 --- a/catalog-ui/src/app/directives/select-property-types/select-data-type-fields-structure/select-data-type-fields-structure.ts +++ b/catalog-ui/src/app/directives/select-property-types/select-data-type-fields-structure/select-data-type-fields-structure.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 1/27/2016. */ diff --git a/catalog-ui/src/app/directives/select-property-types/select-type-list/select-type-list-directive.ts b/catalog-ui/src/app/directives/select-property-types/select-type-list/select-type-list-directive.ts index d277040798..b8f26155af 100644 --- a/catalog-ui/src/app/directives/select-property-types/select-type-list/select-type-list-directive.ts +++ b/catalog-ui/src/app/directives/select-property-types/select-type-list/select-type-list-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rcohen on 9/15/2016. */ diff --git a/catalog-ui/src/app/directives/select-property-types/select-type-map/select-type-map-directive.ts b/catalog-ui/src/app/directives/select-property-types/select-type-map/select-type-map-directive.ts index 19df8dfb71..7e4a25654c 100644 --- a/catalog-ui/src/app/directives/select-property-types/select-type-map/select-type-map-directive.ts +++ b/catalog-ui/src/app/directives/select-property-types/select-type-map/select-type-map-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rcohen on 9/15/2016. */ diff --git a/catalog-ui/src/app/directives/structure-tree/structure-tree-directive.ts b/catalog-ui/src/app/directives/structure-tree/structure-tree-directive.ts index 4d6fbee4db..4f80ae86c0 100644 --- a/catalog-ui/src/app/directives/structure-tree/structure-tree-directive.ts +++ b/catalog-ui/src/app/directives/structure-tree/structure-tree-directive.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/directives/tag/tag-directive.ts b/catalog-ui/src/app/directives/tag/tag-directive.ts index 77a26fc6f7..8bd72e1541 100644 --- a/catalog-ui/src/app/directives/tag/tag-directive.ts +++ b/catalog-ui/src/app/directives/tag/tag-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export class TagData { diff --git a/catalog-ui/src/app/directives/user-header-details/user-header-details-directive.ts b/catalog-ui/src/app/directives/user-header-details/user-header-details-directive.ts index a1a54b0517..eadca96bfa 100644 --- a/catalog-ui/src/app/directives/user-header-details/user-header-details-directive.ts +++ b/catalog-ui/src/app/directives/user-header-details/user-header-details-directive.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {User, IUser, IAppConfigurtaion} from "app/models"; import {IUserResourceClass, IUserResource} from "app/services"; diff --git a/catalog-ui/src/app/directives/utils/expand-collapse-list-header/expand-collapse-list-header.ts b/catalog-ui/src/app/directives/utils/expand-collapse-list-header/expand-collapse-list-header.ts index 73cb2def0b..a06c4c2967 100644 --- a/catalog-ui/src/app/directives/utils/expand-collapse-list-header/expand-collapse-list-header.ts +++ b/catalog-ui/src/app/directives/utils/expand-collapse-list-header/expand-collapse-list-header.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rcohen on 12/5/2016. */ diff --git a/catalog-ui/src/app/directives/utils/expand-collapse-menu-box/expand-collaps-menu-box.ts b/catalog-ui/src/app/directives/utils/expand-collapse-menu-box/expand-collaps-menu-box.ts index 2a2432fcea..d2e361fece 100644 --- a/catalog-ui/src/app/directives/utils/expand-collapse-menu-box/expand-collaps-menu-box.ts +++ b/catalog-ui/src/app/directives/utils/expand-collapse-menu-box/expand-collaps-menu-box.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {MenuItem, MenuItemGroup} from "app/utils"; diff --git a/catalog-ui/src/app/directives/utils/expand-collapse-menu-box/expand-collapse-menu-box.less b/catalog-ui/src/app/directives/utils/expand-collapse-menu-box/expand-collapse-menu-box.less index 13ec1c99be..191a351683 100644 --- a/catalog-ui/src/app/directives/utils/expand-collapse-menu-box/expand-collapse-menu-box.less +++ b/catalog-ui/src/app/directives/utils/expand-collapse-menu-box/expand-collapse-menu-box.less @@ -15,6 +15,7 @@ .expand-collapse-menu-box-title { .f-type._18_m; color: @main_color_a; + text-transform: uppercase; //font-weight: bold; .hand; .w-sdc-designer-sidebar-section-title-text{ @@ -50,7 +51,7 @@ .hand; padding-left: 14px; //margin: 0px 0px 10px 10px; - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; color: @main_color_m; line-height: 18px; diff --git a/catalog-ui/src/app/directives/utils/expand-collapse/expand-collapse.ts b/catalog-ui/src/app/directives/utils/expand-collapse/expand-collapse.ts index 3993f06036..878de11e91 100644 --- a/catalog-ui/src/app/directives/utils/expand-collapse/expand-collapse.ts +++ b/catalog-ui/src/app/directives/utils/expand-collapse/expand-collapse.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IExpandCollapseScope extends ng.IScope { toggle():void; diff --git a/catalog-ui/src/app/directives/utils/sdc-keyboard-events/sdc-keyboard-events.ts b/catalog-ui/src/app/directives/utils/sdc-keyboard-events/sdc-keyboard-events.ts index 71a963a492..a93aff3ffa 100644 --- a/catalog-ui/src/app/directives/utils/sdc-keyboard-events/sdc-keyboard-events.ts +++ b/catalog-ui/src/app/directives/utils/sdc-keyboard-events/sdc-keyboard-events.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface ISdcKeyboardEventsScope extends ng.IScope { diff --git a/catalog-ui/src/app/directives/utils/sdc-tags/sdc-tags.ts b/catalog-ui/src/app/directives/utils/sdc-tags/sdc-tags.ts index 082a77dd9f..df8018894b 100644 --- a/catalog-ui/src/app/directives/utils/sdc-tags/sdc-tags.ts +++ b/catalog-ui/src/app/directives/utils/sdc-tags/sdc-tags.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface ISdcTagsScope extends ng.IScope { diff --git a/catalog-ui/src/app/directives/utils/smart-tooltip/smart-tooltip.ts b/catalog-ui/src/app/directives/utils/smart-tooltip/smart-tooltip.ts index d0177b4094..098134aaae 100644 --- a/catalog-ui/src/app/directives/utils/smart-tooltip/smart-tooltip.ts +++ b/catalog-ui/src/app/directives/utils/smart-tooltip/smart-tooltip.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface ISmartTooltipScope extends ng.IScope { diff --git a/catalog-ui/src/app/directives/utils/validation-on-load/validation-on-load.ts b/catalog-ui/src/app/directives/utils/validation-on-load/validation-on-load.ts index d489efa928..23df56e1aa 100644 --- a/catalog-ui/src/app/directives/utils/validation-on-load/validation-on-load.ts +++ b/catalog-ui/src/app/directives/utils/validation-on-load/validation-on-load.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IValidationOnLoadScope extends ng.IScope { diff --git a/catalog-ui/src/app/filters.ts b/catalog-ui/src/app/filters.ts index 3a71c73289..4ccf3bc6ad 100644 --- a/catalog-ui/src/app/filters.ts +++ b/catalog-ui/src/app/filters.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by ob0695 on 2/26/2017. */ diff --git a/catalog-ui/src/app/filters/catalog-status-filter.ts b/catalog-ui/src/app/filters/catalog-status-filter.ts index c28ec1d1e5..3c0389d57c 100644 --- a/catalog-ui/src/app/filters/catalog-status-filter.ts +++ b/catalog-ui/src/app/filters/catalog-status-filter.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 19/08/2015. */ diff --git a/catalog-ui/src/app/filters/category-type-filter.ts b/catalog-ui/src/app/filters/category-type-filter.ts index 66663263c3..5c89277bb8 100644 --- a/catalog-ui/src/app/filters/category-type-filter.ts +++ b/catalog-ui/src/app/filters/category-type-filter.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {ComponentType} from "../utils/constants"; import {CacheService} from "../services/cache-service"; export class CategoryTypeFilter { diff --git a/catalog-ui/src/app/filters/clear-whitespaces-filter.ts b/catalog-ui/src/app/filters/clear-whitespaces-filter.ts index ea6129e22b..243e5a385b 100644 --- a/catalog-ui/src/app/filters/clear-whitespaces-filter.ts +++ b/catalog-ui/src/app/filters/clear-whitespaces-filter.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class ClearWhiteSpacesFilter { constructor() { diff --git a/catalog-ui/src/app/filters/entity-filter.ts b/catalog-ui/src/app/filters/entity-filter.ts index 97d9b85f9b..6d04bc3c41 100644 --- a/catalog-ui/src/app/filters/entity-filter.ts +++ b/catalog-ui/src/app/filters/entity-filter.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Component, Resource} from "../models"; export class EntityFilter { diff --git a/catalog-ui/src/app/filters/graph-resource-name-filter.ts b/catalog-ui/src/app/filters/graph-resource-name-filter.ts index a4698612f6..7b30f6c44f 100644 --- a/catalog-ui/src/app/filters/graph-resource-name-filter.ts +++ b/catalog-ui/src/app/filters/graph-resource-name-filter.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class GraphResourceNameFilter { constructor() { diff --git a/catalog-ui/src/app/filters/resource-name-filter.ts b/catalog-ui/src/app/filters/resource-name-filter.ts index cd0189dc9a..97de5a2e76 100644 --- a/catalog-ui/src/app/filters/resource-name-filter.ts +++ b/catalog-ui/src/app/filters/resource-name-filter.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class ResourceNameFilter { diff --git a/catalog-ui/src/app/filters/resource-type-filter.ts b/catalog-ui/src/app/filters/resource-type-filter.ts index f2d06f0edd..70abf81f8e 100644 --- a/catalog-ui/src/app/filters/resource-type-filter.ts +++ b/catalog-ui/src/app/filters/resource-type-filter.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {CacheService} from "../services/cache-service"; export class ResourceTypeFilter { diff --git a/catalog-ui/src/app/filters/string-to-date-filter.ts b/catalog-ui/src/app/filters/string-to-date-filter.ts index 846180a2cc..9ad5cafceb 100644 --- a/catalog-ui/src/app/filters/string-to-date-filter.ts +++ b/catalog-ui/src/app/filters/string-to-date-filter.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class StringToDateFilter { constructor() { diff --git a/catalog-ui/src/app/filters/tests-id-filter.ts b/catalog-ui/src/app/filters/tests-id-filter.ts index 0e5af31169..3f0cf5aacd 100644 --- a/catalog-ui/src/app/filters/tests-id-filter.ts +++ b/catalog-ui/src/app/filters/tests-id-filter.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class TestsIdFilter { constructor() { diff --git a/catalog-ui/src/app/filters/trim-filter.ts b/catalog-ui/src/app/filters/trim-filter.ts index f174034748..741aba97a3 100644 --- a/catalog-ui/src/app/filters/trim-filter.ts +++ b/catalog-ui/src/app/filters/trim-filter.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class TrimFilter { constructor() { diff --git a/catalog-ui/src/app/filters/truncate-filter.ts b/catalog-ui/src/app/filters/truncate-filter.ts index e660871e3b..b3380eba34 100644 --- a/catalog-ui/src/app/filters/truncate-filter.ts +++ b/catalog-ui/src/app/filters/truncate-filter.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class TruncateFilter { constructor() { let filter = (str:string, length:number) => { diff --git a/catalog-ui/src/app/models.ts b/catalog-ui/src/app/models.ts index a37df5072a..c7b7577268 100644 --- a/catalog-ui/src/app/models.ts +++ b/catalog-ui/src/app/models.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by ob0695 on 2/23/2017. */ diff --git a/catalog-ui/src/app/models/activity.ts b/catalog-ui/src/app/models/activity.ts index d60e69258c..5d37e0f608 100644 --- a/catalog-ui/src/app/models/activity.ts +++ b/catalog-ui/src/app/models/activity.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 19/11/2015. */ diff --git a/catalog-ui/src/app/models/additional-information.ts b/catalog-ui/src/app/models/additional-information.ts index 0fc850a227..3468badfe5 100644 --- a/catalog-ui/src/app/models/additional-information.ts +++ b/catalog-ui/src/app/models/additional-information.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IAdditionalInformationModel { uniqueId:string; diff --git a/catalog-ui/src/app/models/app-config.ts b/catalog-ui/src/app/models/app-config.ts index a80dd40da8..ef6c195731 100644 --- a/catalog-ui/src/app/models/app-config.ts +++ b/catalog-ui/src/app/models/app-config.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IApi { baseUrl:string; diff --git a/catalog-ui/src/app/models/artifacts.ts b/catalog-ui/src/app/models/artifacts.ts index 63e4b594f1..0aa07d11ed 100644 --- a/catalog-ui/src/app/models/artifacts.ts +++ b/catalog-ui/src/app/models/artifacts.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ArtifactType} from './../utils'; diff --git a/catalog-ui/src/app/models/aschema-property.ts b/catalog-ui/src/app/models/aschema-property.ts index a430a8cc0e..5e99b33193 100644 --- a/catalog-ui/src/app/models/aschema-property.ts +++ b/catalog-ui/src/app/models/aschema-property.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by osonsino on 16/05/2016. */ diff --git a/catalog-ui/src/app/models/attributes.ts b/catalog-ui/src/app/models/attributes.ts index f2562e98bf..9e2dc98855 100644 --- a/catalog-ui/src/app/models/attributes.ts +++ b/catalog-ui/src/app/models/attributes.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {SchemaAttributeGroupModel, SchemaAttribute} from "./schema-attribute"; import {SchemaPropertyGroupModel, SchemaProperty} from "./aschema-property"; diff --git a/catalog-ui/src/app/models/button.ts b/catalog-ui/src/app/models/button.ts index 8fbaf9091c..ad5d0909c7 100644 --- a/catalog-ui/src/app/models/button.ts +++ b/catalog-ui/src/app/models/button.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rc2122 on 5/10/2017. */ diff --git a/catalog-ui/src/app/models/capability.ts b/catalog-ui/src/app/models/capability.ts index 94995bca55..79cf425d92 100644 --- a/catalog-ui/src/app/models/capability.ts +++ b/catalog-ui/src/app/models/capability.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 4/20/2016. */ diff --git a/catalog-ui/src/app/models/categories.ts b/catalog-ui/src/app/models/categories.ts index 2aad61194f..b46c3a6612 100644 --- a/catalog-ui/src/app/models/categories.ts +++ b/catalog-ui/src/app/models/categories.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {IMainCategory} from "./category"; /** * Created by ob0695 on 5/8/2017. diff --git a/catalog-ui/src/app/models/category.ts b/catalog-ui/src/app/models/category.ts index fcfe61bfd6..e45100aecc 100644 --- a/catalog-ui/src/app/models/category.ts +++ b/catalog-ui/src/app/models/category.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; diff --git a/catalog-ui/src/app/models/comments.ts b/catalog-ui/src/app/models/comments.ts index b61713cc2c..8962dc411b 100644 --- a/catalog-ui/src/app/models/comments.ts +++ b/catalog-ui/src/app/models/comments.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export class AsdcComment { diff --git a/catalog-ui/src/app/models/component-metadata.ts b/catalog-ui/src/app/models/component-metadata.ts index 9476d75bd0..2501f0bab5 100644 --- a/catalog-ui/src/app/models/component-metadata.ts +++ b/catalog-ui/src/app/models/component-metadata.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {IMainCategory} from "./category"; /** * Created by obarda on 4/18/2017. diff --git a/catalog-ui/src/app/models/components/component.ts b/catalog-ui/src/app/models/components/component.ts index c7cc81fae7..0c47cc4cb2 100644 --- a/catalog-ui/src/app/models/components/component.ts +++ b/catalog-ui/src/app/models/components/component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {AsdcComment, ArtifactModel, ArtifactGroupModel, IFileDownload, PropertyModel, PropertiesGroup, AttributeModel, AttributesGroup, ComponentInstance, diff --git a/catalog-ui/src/app/models/components/displayComponent.ts b/catalog-ui/src/app/models/components/displayComponent.ts index 8b2b522fd9..a5407e6d17 100644 --- a/catalog-ui/src/app/models/components/displayComponent.ts +++ b/catalog-ui/src/app/models/components/displayComponent.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/components/product.ts b/catalog-ui/src/app/models/components/product.ts index 0f2c00e822..dfb429b971 100644 --- a/catalog-ui/src/app/models/components/product.ts +++ b/catalog-ui/src/app/models/components/product.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 2/4/2016. */ diff --git a/catalog-ui/src/app/models/components/resource.ts b/catalog-ui/src/app/models/components/resource.ts index e594451e1a..9f7a123486 100644 --- a/catalog-ui/src/app/models/components/resource.ts +++ b/catalog-ui/src/app/models/components/resource.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 2/3/2016. */ diff --git a/catalog-ui/src/app/models/components/service.ts b/catalog-ui/src/app/models/components/service.ts index a4dd3155d7..fbe32519c3 100644 --- a/catalog-ui/src/app/models/components/service.ts +++ b/catalog-ui/src/app/models/components/service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 2/4/2016. */ diff --git a/catalog-ui/src/app/models/componentsInstances/componentInstance.ts b/catalog-ui/src/app/models/componentsInstances/componentInstance.ts index 22c6232548..726e3382ba 100644 --- a/catalog-ui/src/app/models/componentsInstances/componentInstance.ts +++ b/catalog-ui/src/app/models/componentsInstances/componentInstance.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 2/4/2016. */ diff --git a/catalog-ui/src/app/models/componentsInstances/productInstance.ts b/catalog-ui/src/app/models/componentsInstances/productInstance.ts index 7b73f83988..91f0999b9a 100644 --- a/catalog-ui/src/app/models/componentsInstances/productInstance.ts +++ b/catalog-ui/src/app/models/componentsInstances/productInstance.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 2/4/2016. */ diff --git a/catalog-ui/src/app/models/componentsInstances/resourceInstance.ts b/catalog-ui/src/app/models/componentsInstances/resourceInstance.ts index be4bde9af9..21943a56e8 100644 --- a/catalog-ui/src/app/models/componentsInstances/resourceInstance.ts +++ b/catalog-ui/src/app/models/componentsInstances/resourceInstance.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 2/4/2016. */ diff --git a/catalog-ui/src/app/models/componentsInstances/serviceInstance.ts b/catalog-ui/src/app/models/componentsInstances/serviceInstance.ts index 060519b83d..97451ee32e 100644 --- a/catalog-ui/src/app/models/componentsInstances/serviceInstance.ts +++ b/catalog-ui/src/app/models/componentsInstances/serviceInstance.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 2/4/2016. */ diff --git a/catalog-ui/src/app/models/csar-component.ts b/catalog-ui/src/app/models/csar-component.ts index 301da959f7..d59edb0b88 100644 --- a/catalog-ui/src/app/models/csar-component.ts +++ b/catalog-ui/src/app/models/csar-component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface ICsarComponent { diff --git a/catalog-ui/src/app/models/data-type-properties.ts b/catalog-ui/src/app/models/data-type-properties.ts index a36e87b0fc..c278ad3af2 100644 --- a/catalog-ui/src/app/models/data-type-properties.ts +++ b/catalog-ui/src/app/models/data-type-properties.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rcohen on 9/25/2016. */ diff --git a/catalog-ui/src/app/models/data-types-map.ts b/catalog-ui/src/app/models/data-types-map.ts index 8aa38e26e7..3591bc2705 100644 --- a/catalog-ui/src/app/models/data-types-map.ts +++ b/catalog-ui/src/app/models/data-types-map.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rcohen on 9/25/2016. */ diff --git a/catalog-ui/src/app/models/data-types.ts b/catalog-ui/src/app/models/data-types.ts index 060ebf7e7d..dc36d78b8f 100644 --- a/catalog-ui/src/app/models/data-types.ts +++ b/catalog-ui/src/app/models/data-types.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rcohen on 9/25/2016. */ diff --git a/catalog-ui/src/app/models/distribution.ts b/catalog-ui/src/app/models/distribution.ts index b6854c68a2..41eedf5949 100644 --- a/catalog-ui/src/app/models/distribution.ts +++ b/catalog-ui/src/app/models/distribution.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export class DistributionStatuses { diff --git a/catalog-ui/src/app/models/export-excel.ts b/catalog-ui/src/app/models/export-excel.ts index 7d0bc56a7b..87f535a3bb 100644 --- a/catalog-ui/src/app/models/export-excel.ts +++ b/catalog-ui/src/app/models/export-excel.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rcohen on 11/7/2016. */ diff --git a/catalog-ui/src/app/models/file-download.ts b/catalog-ui/src/app/models/file-download.ts index d63963e1ba..1ab3c560d5 100644 --- a/catalog-ui/src/app/models/file-download.ts +++ b/catalog-ui/src/app/models/file-download.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IFileDownload { diff --git a/catalog-ui/src/app/models/filter-properties-assignment-data.ts b/catalog-ui/src/app/models/filter-properties-assignment-data.ts index 067ac630de..e81c69e93a 100644 --- a/catalog-ui/src/app/models/filter-properties-assignment-data.ts +++ b/catalog-ui/src/app/models/filter-properties-assignment-data.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rc2122 on 5/16/2017. */ diff --git a/catalog-ui/src/app/models/graph/assetPopoverObj.ts b/catalog-ui/src/app/models/graph/assetPopoverObj.ts index c4fea9b994..e031a32733 100644 --- a/catalog-ui/src/app/models/graph/assetPopoverObj.ts +++ b/catalog-ui/src/app/models/graph/assetPopoverObj.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/graph-links/common-base-link.ts b/catalog-ui/src/app/models/graph/graph-links/common-base-link.ts index 4d6d989daf..0e3626fb9a 100644 --- a/catalog-ui/src/app/models/graph/graph-links/common-base-link.ts +++ b/catalog-ui/src/app/models/graph/graph-links/common-base-link.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/graph-links/common-ci-link-base.ts b/catalog-ui/src/app/models/graph/graph-links/common-ci-link-base.ts index 12e66c86f9..a320a0fdd4 100644 --- a/catalog-ui/src/app/models/graph/graph-links/common-ci-link-base.ts +++ b/catalog-ui/src/app/models/graph/graph-links/common-ci-link-base.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-link-base.ts b/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-link-base.ts index 04b28c7ceb..e344d397e9 100644 --- a/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-link-base.ts +++ b/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-link-base.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-simple-link.ts b/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-simple-link.ts index e213fa9b33..0f4e771fa9 100644 --- a/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-simple-link.ts +++ b/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-simple-link.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-ucpe-host-link.ts b/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-ucpe-host-link.ts index b756dab129..718d5f1a89 100644 --- a/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-ucpe-host-link.ts +++ b/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-ucpe-host-link.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-ucpe-link.ts b/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-ucpe-link.ts index fc8631781a..6b2e12a215 100644 --- a/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-ucpe-link.ts +++ b/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-ucpe-link.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-vl-link.ts b/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-vl-link.ts index e0824ccbe8..d082b45617 100644 --- a/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-vl-link.ts +++ b/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-vl-link.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-vl-ucpe-link.ts b/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-vl-ucpe-link.ts index 854eeecad5..7ccde9b530 100644 --- a/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-vl-ucpe-link.ts +++ b/catalog-ui/src/app/models/graph/graph-links/composition-graph-links/composition-ci-vl-ucpe-link.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/graph-links/links-factory.ts b/catalog-ui/src/app/models/graph/graph-links/links-factory.ts index 1744aa0ff3..0be5d6faf6 100644 --- a/catalog-ui/src/app/models/graph/graph-links/links-factory.ts +++ b/catalog-ui/src/app/models/graph/graph-links/links-factory.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/graph-links/module-graph-links/module-ci-link-base.ts b/catalog-ui/src/app/models/graph/graph-links/module-graph-links/module-ci-link-base.ts index 73cd2923eb..71185b2f59 100644 --- a/catalog-ui/src/app/models/graph/graph-links/module-graph-links/module-ci-link-base.ts +++ b/catalog-ui/src/app/models/graph/graph-links/module-graph-links/module-ci-link-base.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/graph-links/module-graph-links/module-ci-vl-link.ts b/catalog-ui/src/app/models/graph/graph-links/module-graph-links/module-ci-vl-link.ts index 0bc675d465..3d36d965e2 100644 --- a/catalog-ui/src/app/models/graph/graph-links/module-graph-links/module-ci-vl-link.ts +++ b/catalog-ui/src/app/models/graph/graph-links/module-graph-links/module-ci-vl-link.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/graphTooltip.ts b/catalog-ui/src/app/models/graph/graphTooltip.ts index 790608e7f7..4ddbac0520 100644 --- a/catalog-ui/src/app/models/graph/graphTooltip.ts +++ b/catalog-ui/src/app/models/graph/graphTooltip.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/link-menu.ts b/catalog-ui/src/app/models/graph/link-menu.ts index b3352dd815..fd7934cc8e 100644 --- a/catalog-ui/src/app/models/graph/link-menu.ts +++ b/catalog-ui/src/app/models/graph/link-menu.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/match-relation.ts b/catalog-ui/src/app/models/graph/match-relation.ts index 2de2e930b6..4fb073d579 100644 --- a/catalog-ui/src/app/models/graph/match-relation.ts +++ b/catalog-ui/src/app/models/graph/match-relation.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/nodes/base-common-node.ts b/catalog-ui/src/app/models/graph/nodes/base-common-node.ts index aee6b02086..153a18225d 100644 --- a/catalog-ui/src/app/models/graph/nodes/base-common-node.ts +++ b/catalog-ui/src/app/models/graph/nodes/base-common-node.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/nodes/common-ci-node-base.ts b/catalog-ui/src/app/models/graph/nodes/common-ci-node-base.ts index 98fb583625..fb051c891d 100644 --- a/catalog-ui/src/app/models/graph/nodes/common-ci-node-base.ts +++ b/catalog-ui/src/app/models/graph/nodes/common-ci-node-base.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-base.ts b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-base.ts index d17d97ac19..1e4a735a53 100644 --- a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-base.ts +++ b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-base.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-cp.ts b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-cp.ts index e6d0cc178f..85534c78de 100644 --- a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-cp.ts +++ b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-cp.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-service.ts b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-service.ts index dd2fb6c6dd..3a9b8457fd 100644 --- a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-service.ts +++ b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-service.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-ucpe-cp.ts b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-ucpe-cp.ts index 37882963d3..5013e52457 100644 --- a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-ucpe-cp.ts +++ b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-ucpe-cp.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-ucpe.ts b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-ucpe.ts index d209a10019..b8f844cba8 100644 --- a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-ucpe.ts +++ b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-ucpe.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vf.ts b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vf.ts index cb0cd59b13..5d37db30fc 100644 --- a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vf.ts +++ b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vf.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vfc.ts b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vfc.ts index e08e6a4915..c8ae004003 100644 --- a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vfc.ts +++ b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vfc.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vl.ts b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vl.ts index 596d12058f..db46e48ad7 100644 --- a/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vl.ts +++ b/catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vl.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/nodes/modules-graph-nodes/module-node-base.ts b/catalog-ui/src/app/models/graph/nodes/modules-graph-nodes/module-node-base.ts index 51e3591304..ccc8ed4afa 100644 --- a/catalog-ui/src/app/models/graph/nodes/modules-graph-nodes/module-node-base.ts +++ b/catalog-ui/src/app/models/graph/nodes/modules-graph-nodes/module-node-base.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/nodes/nodes-factory.ts b/catalog-ui/src/app/models/graph/nodes/nodes-factory.ts index 6c4f71e722..c7f8eaa126 100644 --- a/catalog-ui/src/app/models/graph/nodes/nodes-factory.ts +++ b/catalog-ui/src/app/models/graph/nodes/nodes-factory.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/point.ts b/catalog-ui/src/app/models/graph/point.ts index 8fece5af99..85b952c48c 100644 --- a/catalog-ui/src/app/models/graph/point.ts +++ b/catalog-ui/src/app/models/graph/point.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 11/7/2016. */ diff --git a/catalog-ui/src/app/models/graph/relationMenuObjects.ts b/catalog-ui/src/app/models/graph/relationMenuObjects.ts index aaef0b218c..37b7cee349 100644 --- a/catalog-ui/src/app/models/graph/relationMenuObjects.ts +++ b/catalog-ui/src/app/models/graph/relationMenuObjects.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/graph/relationship.ts b/catalog-ui/src/app/models/graph/relationship.ts index 6345ab4c04..67a5488b59 100644 --- a/catalog-ui/src/app/models/graph/relationship.ts +++ b/catalog-ui/src/app/models/graph/relationship.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/models/heat-parameters.ts b/catalog-ui/src/app/models/heat-parameters.ts index be5ad92fb0..a199c9d847 100644 --- a/catalog-ui/src/app/models/heat-parameters.ts +++ b/catalog-ui/src/app/models/heat-parameters.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rcohen on 10/31/2016. */ diff --git a/catalog-ui/src/app/models/input-property-base.ts b/catalog-ui/src/app/models/input-property-base.ts index dce76d597e..33803b1034 100644 --- a/catalog-ui/src/app/models/input-property-base.ts +++ b/catalog-ui/src/app/models/input-property-base.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 1/22/2017. */ diff --git a/catalog-ui/src/app/models/inputs-and-properties.ts b/catalog-ui/src/app/models/inputs-and-properties.ts index 18ff928918..c7b34ae6df 100644 --- a/catalog-ui/src/app/models/inputs-and-properties.ts +++ b/catalog-ui/src/app/models/inputs-and-properties.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 1/11/2017. */ diff --git a/catalog-ui/src/app/models/inputs.ts b/catalog-ui/src/app/models/inputs.ts index 55e739b452..cbed226324 100644 --- a/catalog-ui/src/app/models/inputs.ts +++ b/catalog-ui/src/app/models/inputs.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 8/24/2016. */ diff --git a/catalog-ui/src/app/models/instance-inputs-properties-map.ts b/catalog-ui/src/app/models/instance-inputs-properties-map.ts index 47b99dfffd..650a6d7b51 100644 --- a/catalog-ui/src/app/models/instance-inputs-properties-map.ts +++ b/catalog-ui/src/app/models/instance-inputs-properties-map.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 9/12/2016. */ diff --git a/catalog-ui/src/app/models/left-panel.ts b/catalog-ui/src/app/models/left-panel.ts index 759d5f317e..7e0834245d 100644 --- a/catalog-ui/src/app/models/left-panel.ts +++ b/catalog-ui/src/app/models/left-panel.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export class LeftPanelModel { diff --git a/catalog-ui/src/app/models/member.ts b/catalog-ui/src/app/models/member.ts index a2d9d17aec..fff523ea5e 100644 --- a/catalog-ui/src/app/models/member.ts +++ b/catalog-ui/src/app/models/member.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 8/2/2016. */ diff --git a/catalog-ui/src/app/models/modules/base-module.ts b/catalog-ui/src/app/models/modules/base-module.ts index 4a5f282468..53a28f076e 100644 --- a/catalog-ui/src/app/models/modules/base-module.ts +++ b/catalog-ui/src/app/models/modules/base-module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 6/30/2016. */ diff --git a/catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts b/catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts index 2178319e0b..8ed5c734c0 100644 --- a/catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts +++ b/catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { SchemaPropertyGroupModel, SchemaProperty } from '../aschema-property'; import { DerivedPropertyType, PropertyBEModel } from '../../models'; import { PROPERTY_TYPES } from 'app/utils'; diff --git a/catalog-ui/src/app/models/properties-inputs/input-be-model.ts b/catalog-ui/src/app/models/properties-inputs/input-be-model.ts index 72afd77038..f6548a352c 100644 --- a/catalog-ui/src/app/models/properties-inputs/input-be-model.ts +++ b/catalog-ui/src/app/models/properties-inputs/input-be-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {PropertyBEModel} from 'app/models'; /** * Created by rc2122 on 6/1/2017. diff --git a/catalog-ui/src/app/models/properties-inputs/input-fe-model.ts b/catalog-ui/src/app/models/properties-inputs/input-fe-model.ts index f79a7e6317..04a224bff7 100644 --- a/catalog-ui/src/app/models/properties-inputs/input-fe-model.ts +++ b/catalog-ui/src/app/models/properties-inputs/input-fe-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { SchemaPropertyGroupModel, SchemaProperty } from "../aschema-property"; import { PropertyBEModel } from "../../models"; import {PROPERTY_DATA} from "../../utils/constants"; @@ -20,4 +40,4 @@ export class InputFEModel extends InputBEModel { } } -} \ No newline at end of file +} diff --git a/catalog-ui/src/app/models/properties-inputs/property-be-model.ts b/catalog-ui/src/app/models/properties-inputs/property-be-model.ts index 0f22d53434..c46c8ad28d 100644 --- a/catalog-ui/src/app/models/properties-inputs/property-be-model.ts +++ b/catalog-ui/src/app/models/properties-inputs/property-be-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { PropertyInputDetail, SchemaPropertyGroupModel, SchemaProperty } from "app/models"; import { PROPERTY_DATA, PROPERTY_TYPES } from 'app/utils'; export enum DerivedPropertyType { diff --git a/catalog-ui/src/app/models/properties-inputs/property-declare-api-model.ts b/catalog-ui/src/app/models/properties-inputs/property-declare-api-model.ts index ddb7bd4391..5b1c12091b 100644 --- a/catalog-ui/src/app/models/properties-inputs/property-declare-api-model.ts +++ b/catalog-ui/src/app/models/properties-inputs/property-declare-api-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import { PropertyBEModel, PropertyFEModel, DerivedFEProperty } from "../../models"; diff --git a/catalog-ui/src/app/models/properties-inputs/property-fe-map.ts b/catalog-ui/src/app/models/properties-inputs/property-fe-map.ts index 3b267460b1..30cfcf09fd 100644 --- a/catalog-ui/src/app/models/properties-inputs/property-fe-map.ts +++ b/catalog-ui/src/app/models/properties-inputs/property-fe-map.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import { PropertyBEModel, PropertyFEModel } from "../../models"; diff --git a/catalog-ui/src/app/models/properties-inputs/property-fe-model.ts b/catalog-ui/src/app/models/properties-inputs/property-fe-model.ts index bfb6462f63..78d01d9af2 100644 --- a/catalog-ui/src/app/models/properties-inputs/property-fe-model.ts +++ b/catalog-ui/src/app/models/properties-inputs/property-fe-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {SchemaPropertyGroupModel, SchemaProperty} from '../aschema-property'; import { PROPERTY_DATA, PROPERTY_TYPES } from 'app/utils'; import { FilterPropertiesAssignmentData, PropertyBEModel, DerivedPropertyType, DerivedFEPropertyMap, DerivedFEProperty } from 'app/models'; diff --git a/catalog-ui/src/app/models/properties-inputs/property-input-detail.ts b/catalog-ui/src/app/models/properties-inputs/property-input-detail.ts index 03f7b4090b..8c1028c45b 100644 --- a/catalog-ui/src/app/models/properties-inputs/property-input-detail.ts +++ b/catalog-ui/src/app/models/properties-inputs/property-input-detail.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class PropertyInputDetail { inputId: string; inputName: string; diff --git a/catalog-ui/src/app/models/properties-inputs/simple-flat-property.ts b/catalog-ui/src/app/models/properties-inputs/simple-flat-property.ts index d67a7d4d14..e38eeb005d 100644 --- a/catalog-ui/src/app/models/properties-inputs/simple-flat-property.ts +++ b/catalog-ui/src/app/models/properties-inputs/simple-flat-property.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class SimpleFlatProperty { uniqueId: string; path: string; @@ -12,4 +32,4 @@ export class SimpleFlatProperty { this.parentName = parentName; this.instanceName = instanceName; } -} \ No newline at end of file +} diff --git a/catalog-ui/src/app/models/properties.ts b/catalog-ui/src/app/models/properties.ts index 99a5b86fb9..f46bf8beb0 100644 --- a/catalog-ui/src/app/models/properties.ts +++ b/catalog-ui/src/app/models/properties.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {SchemaPropertyGroupModel, SchemaProperty} from "./aschema-property"; import {InputPropertyBase} from "./input-property-base"; diff --git a/catalog-ui/src/app/models/requirement.ts b/catalog-ui/src/app/models/requirement.ts index e62c809ec9..53e870679d 100644 --- a/catalog-ui/src/app/models/requirement.ts +++ b/catalog-ui/src/app/models/requirement.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 4/20/2016. */ diff --git a/catalog-ui/src/app/models/schema-attribute.ts b/catalog-ui/src/app/models/schema-attribute.ts index 3c48aa3fa2..c635203e17 100644 --- a/catalog-ui/src/app/models/schema-attribute.ts +++ b/catalog-ui/src/app/models/schema-attribute.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {SchemaProperty} from "./aschema-property"; diff --git a/catalog-ui/src/app/models/tab.ts b/catalog-ui/src/app/models/tab.ts index a7ce509ce0..a7df7bfa92 100644 --- a/catalog-ui/src/app/models/tab.ts +++ b/catalog-ui/src/app/models/tab.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 7/31/2016. */ diff --git a/catalog-ui/src/app/models/tooltip-data.ts b/catalog-ui/src/app/models/tooltip-data.ts index 902a20e926..acc35eedc7 100644 --- a/catalog-ui/src/app/models/tooltip-data.ts +++ b/catalog-ui/src/app/models/tooltip-data.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export class TooltipData { diff --git a/catalog-ui/src/app/models/user.ts b/catalog-ui/src/app/models/user.ts index 8ef800acb7..ec42aed553 100644 --- a/catalog-ui/src/app/models/user.ts +++ b/catalog-ui/src/app/models/user.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IUserResource} from "../services/user-resource-service"; diff --git a/catalog-ui/src/app/models/validate.ts b/catalog-ui/src/app/models/validate.ts index 59638ab4dd..6c8975f0d8 100644 --- a/catalog-ui/src/app/models/validate.ts +++ b/catalog-ui/src/app/models/validate.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IValidate { diff --git a/catalog-ui/src/app/models/validation-config.ts b/catalog-ui/src/app/models/validation-config.ts index 3524addf86..ac15d2850e 100644 --- a/catalog-ui/src/app/models/validation-config.ts +++ b/catalog-ui/src/app/models/validation-config.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + class PropertyValue { min: number; max: number; diff --git a/catalog-ui/src/app/modules/directive-module.ts b/catalog-ui/src/app/modules/directive-module.ts index 6ad89b8db7..8142cc49bd 100644 --- a/catalog-ui/src/app/modules/directive-module.ts +++ b/catalog-ui/src/app/modules/directive-module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {ClickedOutsideDirective} from "../directives/clicked-outside/clicked-outside-directive"; import {LoaderDirective} from "../directives/loader/loader-directive"; import {UserHeaderDetailsDirective} from "../directives/user-header-details/user-header-details-directive"; diff --git a/catalog-ui/src/app/modules/filters.ts b/catalog-ui/src/app/modules/filters.ts index a62283f927..95fe583a04 100644 --- a/catalog-ui/src/app/modules/filters.ts +++ b/catalog-ui/src/app/modules/filters.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {TestsIdFilter} from "../filters/tests-id-filter"; import {TrimFilter} from "../filters/trim-filter"; import {ResourceTypeFilter} from "../filters/resource-type-filter"; diff --git a/catalog-ui/src/app/modules/service-module.ts b/catalog-ui/src/app/modules/service-module.ts index 55ba87b9fb..bf9ebce749 100644 --- a/catalog-ui/src/app/modules/service-module.ts +++ b/catalog-ui/src/app/modules/service-module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {ConfigurationUiService} from "../services/configuration-ui-service"; import {CookieService} from "../services/cookie-service"; import {EntityService} from "../services/entity-service"; diff --git a/catalog-ui/src/app/modules/utils.ts b/catalog-ui/src/app/modules/utils.ts index 529857ac39..7a57478c1c 100644 --- a/catalog-ui/src/app/modules/utils.ts +++ b/catalog-ui/src/app/modules/utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {ComponentFactory} from "../utils/component-factory"; import {ComponentInstanceFactory} from "../utils/component-instance-factory"; import {ChangeLifecycleStateHandler} from "../utils/change-lifecycle-state-handler"; diff --git a/catalog-ui/src/app/modules/view-model-module.ts b/catalog-ui/src/app/modules/view-model-module.ts index 7bfc014c36..de7bc5ac1f 100644 --- a/catalog-ui/src/app/modules/view-model-module.ts +++ b/catalog-ui/src/app/modules/view-model-module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {AddCategoryModalViewModel} from "../view-models/admin-dashboard/add-category-modal/add-category-modal-view-model"; import {DashboardViewModel} from "../view-models/dashboard/dashboard-view-model"; import {WorkspaceViewModel} from "../view-models/workspace/workspace-view-model"; diff --git a/catalog-ui/src/app/ng2/app.component.ts b/catalog-ui/src/app/ng2/app.component.ts index 0499045a79..58f483ae11 100644 --- a/catalog-ui/src/app/ng2/app.component.ts +++ b/catalog-ui/src/app/ng2/app.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, Inject } from '@angular/core'; import { AuthenticationService } from './services/authentication.service'; diff --git a/catalog-ui/src/app/ng2/app.module.ts b/catalog-ui/src/app/ng2/app.module.ts index 970c57de89..09b40e920f 100644 --- a/catalog-ui/src/app/ng2/app.module.ts +++ b/catalog-ui/src/app/ng2/app.module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {BrowserModule} from '@angular/platform-browser'; import {NgModule, APP_INITIALIZER} from '@angular/core'; import {FormsModule} from '@angular/forms'; diff --git a/catalog-ui/src/app/ng2/app.routing.ts b/catalog-ui/src/app/ng2/app.routing.ts index 38bc92619f..e7ed098da5 100644 --- a/catalog-ui/src/app/ng2/app.routing.ts +++ b/catalog-ui/src/app/ng2/app.routing.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { RouterModule, Route } from '@angular/router'; import { ModuleWithProviders } from '@angular/core'; // import { Page1Component } from "./pages/page1/page1.component"; diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.component.ts index 0c74765944..246258e44f 100644 --- a/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.component.ts +++ b/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, Compiler, EventEmitter, ViewContainerRef, ViewChild, Input, Output, ElementRef, ComponentRef, ComponentFactory, ComponentFactoryResolver } from '@angular/core' import { UiElementCheckBoxComponent } from './elements-ui/checkbox/ui-element-checkbox.component'; import { UiElementDropDownComponent, DropdownValue } from './elements-ui/dropdown/ui-element-dropdown.component'; diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.module.ts b/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.module.ts index f53b8616ac..b57020a1d0 100644 --- a/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.module.ts +++ b/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { NgModule } from "@angular/core"; import { UiElementCheckBoxComponent } from './elements-ui/checkbox/ui-element-checkbox.component'; import { UiElementDropDownComponent } from './elements-ui/dropdown/ui-element-dropdown.component'; diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.ts index 152303aee7..f73afd42c7 100644 --- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.ts +++ b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, ViewChild, ElementRef, ContentChildren, Input } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser' import { UiElementBase, UiElementBaseInterface } from './../ui-element-base.component'; diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.ts index b1fb37a186..970c61531f 100644 --- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.ts +++ b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, EventEmitter, Output, Input } from '@angular/core' import { BrowserModule } from '@angular/platform-browser' import { UiElementBase, UiElementBaseInterface } from './../ui-element-base.component'; diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.ts index 2d64d9b713..fb3b3db859 100644 --- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.ts +++ b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Component, ViewChild, ElementRef, ContentChildren, Input} from '@angular/core'; import { BrowserModule } from '@angular/platform-browser' import { UiElementBase, UiElementBaseInterface } from './../ui-element-base.component'; diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.ts index d42c80a89e..8b27ab7e3a 100644 --- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.ts +++ b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Component, ViewChild, ElementRef, ContentChildren, Input} from '@angular/core'; import { BrowserModule } from '@angular/platform-browser' import { UiElementBase, UiElementBaseInterface } from './../ui-element-base.component'; diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.ts index 84dd884d1f..67eb8822b4 100644 --- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.ts +++ b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Component, ViewChild, ElementRef, Input} from '@angular/core'; import {UiElementBase, UiElementBaseInterface} from "../ui-element-base.component"; import {ButtonsModelMap, ButtonModel} from "app/models"; diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/ui-element-base.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/ui-element-base.component.ts index fa2be1048c..4bc35e814a 100644 --- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/ui-element-base.component.ts +++ b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/ui-element-base.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, EventEmitter, Input, Output } from '@angular/core' import { ValidationConfiguration } from "app/models"; import { FormControl, Validators } from '@angular/forms'; diff --git a/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.ts b/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.ts index c23e08bc0d..c43c30db21 100644 --- a/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.ts +++ b/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rc2122 on 5/16/2017. */ diff --git a/catalog-ui/src/app/ng2/components/hierarchy-navigtion/hierarchy-display-options.ts b/catalog-ui/src/app/ng2/components/hierarchy-navigtion/hierarchy-display-options.ts index 7045286ccd..c8d4566653 100644 --- a/catalog-ui/src/app/ng2/components/hierarchy-navigtion/hierarchy-display-options.ts +++ b/catalog-ui/src/app/ng2/components/hierarchy-navigtion/hierarchy-display-options.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class HierarchyDisplayOptions { idProperty: string; valueProperty: string; diff --git a/catalog-ui/src/app/ng2/components/hierarchy-navigtion/hierarchy-navigation.component.ts b/catalog-ui/src/app/ng2/components/hierarchy-navigtion/hierarchy-navigation.component.ts index 428bbb4b04..dc0a02c277 100644 --- a/catalog-ui/src/app/ng2/components/hierarchy-navigtion/hierarchy-navigation.component.ts +++ b/catalog-ui/src/app/ng2/components/hierarchy-navigtion/hierarchy-navigation.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Component, Input, Output, EventEmitter} from '@angular/core'; import {HierarchyDisplayOptions} from './hierarchy-display-options'; diff --git a/catalog-ui/src/app/ng2/components/inputs-table/confirmation-delete-input/confirmation-delete-input.component.ts b/catalog-ui/src/app/ng2/components/inputs-table/confirmation-delete-input/confirmation-delete-input.component.ts index 24c37b5636..f73692f525 100644 --- a/catalog-ui/src/app/ng2/components/inputs-table/confirmation-delete-input/confirmation-delete-input.component.ts +++ b/catalog-ui/src/app/ng2/components/inputs-table/confirmation-delete-input/confirmation-delete-input.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rc2122 on 6/1/2017. */ diff --git a/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.less b/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.less index 96d4d0a4eb..05378f0eb9 100644 --- a/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.less +++ b/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.less @@ -16,16 +16,16 @@ overflow: hidden; height: 20px; } - + .table-header { font-weight:bold; border-top: #d2d2d2 solid 1px; background-color: #eaeaea; color:#191919; - + .table-cell { - font-size: 14px; + font-size: 13px; } .valueCol { justify-content: flex-start; diff --git a/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.ts b/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.ts index f2cac21237..526f5de360 100644 --- a/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.ts +++ b/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rc2122 on 5/4/2017. */ diff --git a/catalog-ui/src/app/ng2/components/loader/loader.component.ts b/catalog-ui/src/app/ng2/components/loader/loader.component.ts index 4af92eca24..92278d3ff5 100644 --- a/catalog-ui/src/app/ng2/components/loader/loader.component.ts +++ b/catalog-ui/src/app/ng2/components/loader/loader.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rc2122 on 6/6/2017. */ diff --git a/catalog-ui/src/app/ng2/components/modal/modal.component.ts b/catalog-ui/src/app/ng2/components/modal/modal.component.ts index 4a00871b21..e432a6fde0 100644 --- a/catalog-ui/src/app/ng2/components/modal/modal.component.ts +++ b/catalog-ui/src/app/ng2/components/modal/modal.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rc2122 on 6/1/2017. */ diff --git a/catalog-ui/src/app/ng2/components/popover/popover-content.component.less b/catalog-ui/src/app/ng2/components/popover/popover-content.component.less index f7b62e91f7..04cdd3914b 100644 --- a/catalog-ui/src/app/ng2/components/popover/popover-content.component.less +++ b/catalog-ui/src/app/ng2/components/popover/popover-content.component.less @@ -39,10 +39,14 @@ -ms-flex-align: center; align-items: center; margin: 0px 20px; + max-width:350px; + .title{ - -webkit-box-flex: 999; - -ms-flex-positive: 999; - flex-grow: 999; + flex: 1; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .close-button{ .sprite; diff --git a/catalog-ui/src/app/ng2/components/popover/popover-content.component.ts b/catalog-ui/src/app/ng2/components/popover/popover-content.component.ts index c4489f59b9..6eb36287d0 100644 --- a/catalog-ui/src/app/ng2/components/popover/popover-content.component.ts +++ b/catalog-ui/src/app/ng2/components/popover/popover-content.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Component, Input, Output, AfterViewInit, ElementRef, ChangeDetectorRef, OnDestroy, ViewChild, EventEmitter, Renderer } from "@angular/core"; import {ButtonsModelMap} from "app/models"; import {PopoverComponent} from "./popover.component"; diff --git a/catalog-ui/src/app/ng2/components/popover/popover.component.ts b/catalog-ui/src/app/ng2/components/popover/popover.component.ts index a7e2881b29..e976bc7bf2 100644 --- a/catalog-ui/src/app/ng2/components/popover/popover.component.ts +++ b/catalog-ui/src/app/ng2/components/popover/popover.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Directive, HostListener, ComponentRef, ViewContainerRef, ComponentFactoryResolver, ComponentFactory, Input, OnChanges, SimpleChange, Output, EventEmitter } from "@angular/core"; import {PopoverContentComponent} from "./popover-content.component"; diff --git a/catalog-ui/src/app/ng2/components/popover/popover.module.ts b/catalog-ui/src/app/ng2/components/popover/popover.module.ts index 4bd8426ce1..a9605c17b6 100644 --- a/catalog-ui/src/app/ng2/components/popover/popover.module.ts +++ b/catalog-ui/src/app/ng2/components/popover/popover.module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rc2122 on 5/17/2017. */ diff --git a/catalog-ui/src/app/ng2/components/properties-table/dynamic-property/dynamic-property.component.ts b/catalog-ui/src/app/ng2/components/properties-table/dynamic-property/dynamic-property.component.ts index 3713676040..e078b74d65 100644 --- a/catalog-ui/src/app/ng2/components/properties-table/dynamic-property/dynamic-property.component.ts +++ b/catalog-ui/src/app/ng2/components/properties-table/dynamic-property/dynamic-property.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Component, Input, Output, EventEmitter} from "@angular/core"; import { PropertyBEModel, PropertyFEModel, DerivedFEProperty, DerivedPropertyType, SchemaPropertyGroupModel, DataTypeModel } from "app/models"; import { PROPERTY_DATA, PROPERTY_TYPES } from 'app/utils'; diff --git a/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.less b/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.less index 41ff5ede13..3eb7e960ab 100644 --- a/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.less +++ b/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.less @@ -29,7 +29,7 @@ .table-cell { color:#191919; - font-size:14px; + font-size:13px; } } @@ -128,7 +128,7 @@ @media @smaller-screen { flex: 1 0 40%;} } - + /deep/ .checkbox-container { margin-right: 10px; } @@ -155,7 +155,7 @@ background-color: yellow; } } - + dynamic-property { width:100%; &:last-child /deep/ .dynamic-property-row { @@ -163,4 +163,4 @@ } } -} \ No newline at end of file +} diff --git a/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.ts b/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.ts index f1721c0708..afb7189348 100644 --- a/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.ts +++ b/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, Input, Output, EventEmitter, SimpleChanges, ViewChild, ElementRef } from "@angular/core"; import {PropertyFEModel, DerivedFEProperty, DerivedPropertyType, InstanceFePropertiesMap} from "app/models"; import {PropertiesService} from "../../services/properties.service"; diff --git a/catalog-ui/src/app/ng2/components/tooltip/tooltip-content.component.ts b/catalog-ui/src/app/ng2/components/tooltip/tooltip-content.component.ts index 6e3e8065bb..4dcb64c499 100644 --- a/catalog-ui/src/app/ng2/components/tooltip/tooltip-content.component.ts +++ b/catalog-ui/src/app/ng2/components/tooltip/tooltip-content.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Component, AfterViewInit, Input, ElementRef, ChangeDetectorRef} from "@angular/core"; @Component diff --git a/catalog-ui/src/app/ng2/components/tooltip/tooltip.component.ts b/catalog-ui/src/app/ng2/components/tooltip/tooltip.component.ts index 891aa60860..79d35c6e0e 100644 --- a/catalog-ui/src/app/ng2/components/tooltip/tooltip.component.ts +++ b/catalog-ui/src/app/ng2/components/tooltip/tooltip.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Directive, ComponentRef, ViewContainerRef, ComponentFactoryResolver, Input, HostListener } from "@angular/core"; diff --git a/catalog-ui/src/app/ng2/components/tooltip/tooltip.module.ts b/catalog-ui/src/app/ng2/components/tooltip/tooltip.module.ts index 69976da6af..84a3987081 100644 --- a/catalog-ui/src/app/ng2/components/tooltip/tooltip.module.ts +++ b/catalog-ui/src/app/ng2/components/tooltip/tooltip.module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {NgModule} from "@angular/core"; import {TooltipContentComponent} from "./tooltip-content.component"; import {TooltipComponent} from "./tooltip.component"; diff --git a/catalog-ui/src/app/ng2/pages/page404/page404.component.ts b/catalog-ui/src/app/ng2/pages/page404/page404.component.ts index a3baf4fd02..d93fe22285 100644 --- a/catalog-ui/src/app/ng2/pages/page404/page404.component.ts +++ b/catalog-ui/src/app/ng2/pages/page404/page404.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, Inject } from '@angular/core'; @Component({ diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.module.ts b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.module.ts index b14f3afd6b..1e09c9e4c6 100644 --- a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.module.ts +++ b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { NgModule } from "@angular/core"; import { PropertiesAssignmentComponent } from "./properties-assignment.page.component"; import { HierarchyNavigationComponent } from "./../../components/hierarchy-navigtion/hierarchy-navigation.component"; diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.less b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.less index 15244e5fa5..ab059b1240 100644 --- a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.less +++ b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.less @@ -16,7 +16,7 @@ .properties-assignment-page { height: 100%; - font-family: 'Open Sans', omnes-regular, sans-serif; + font-family: @font-opensans-regular; .main-content { display:flex; @@ -66,7 +66,7 @@ right: 100px; display:flex; flex-direction:row; - + .search-box { border: 1px solid @ng2-medium-gray; border-radius: 3px; @@ -102,6 +102,7 @@ .clear-filter{ cursor: pointer; color:#009fdb; + font-family: @font-opensans-medium-italic; text-decoration: underline; padding-right:10px; font-size:12px; diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.ts b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.ts index 3efe866479..30ba6c0755 100644 --- a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.ts +++ b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Component, ViewChild, ElementRef, Renderer, Inject} from "@angular/core"; import { PropertiesService } from "../../services/properties.service"; import { HierarchyNavService } from "../../services/hierarchy-nav.service"; @@ -273,19 +293,21 @@ export class PropertiesAssignmentComponent { console.log("==>" + this.constructor.name + ": declareProperties"); let selectedProperties: InstanceBePropertiesMap = new InstanceBePropertiesMap(); - - let instancesNames = new KeysPipe().transform(this.instanceFePropertiesMap, []); - angular.forEach(instancesNames, (instanceName: string): void => { - selectedProperties[instanceName] = this.propertiesService.getCheckedProperties(this.instanceFePropertiesMap[instanceName]); - //selectedProperties[this.selectedInstanceData.uniqueId] = this.propertiesService.getCheckedProperties(this.properties); + let selectedInputs: InstanceBePropertiesMap = new InstanceBePropertiesMap(); + let instancesIds = new KeysPipe().transform(this.instanceFePropertiesMap, []); + + angular.forEach(instancesIds, (instanceId: string): void => { + let selectedInstanceData: ResourceInstance = this.instances.find(instance => instance.uniqueId == instanceId); + let originType: string = (selectedInstanceData) ? selectedInstanceData.originType : this.selectedInstanceType; + if (!this.isInput(originType)) { + selectedProperties[instanceId] = this.propertiesService.getCheckedProperties(this.instanceFePropertiesMap[instanceId]); + } else { + selectedInputs[instanceId] = this.propertiesService.getCheckedProperties(this.instanceFePropertiesMap[instanceId]); + } }); - let inputsToCreate: InstancePropertiesAPIMap; - if (!this.isInput(this.selectedInstanceType)) { - inputsToCreate = new InstancePropertiesAPIMap(null, selectedProperties); - } else { - inputsToCreate = new InstancePropertiesAPIMap(selectedProperties, null); - } + let inputsToCreate: InstancePropertiesAPIMap = new InstancePropertiesAPIMap(selectedInputs, selectedProperties); + this.componentServiceNg2 .createInput(this.component, inputsToCreate) .subscribe(response => { diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/properties.utils.ts b/catalog-ui/src/app/ng2/pages/properties-assignment/properties.utils.ts index bd629939be..a3507feb6f 100644 --- a/catalog-ui/src/app/ng2/pages/properties-assignment/properties.utils.ts +++ b/catalog-ui/src/app/ng2/pages/properties-assignment/properties.utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Injectable } from '@angular/core'; import { DataTypeModel, PropertyFEModel, PropertyBEModel, InstanceBePropertiesMap, InstanceFePropertiesMap, SchemaProperty, DerivedFEProperty, DerivedFEPropertyMap, DerivedPropertyType, InputFEModel} from "app/models"; import { DataTypeService } from "app/ng2/services/data-type.service"; diff --git a/catalog-ui/src/app/ng2/pipes/contentAfterLastDot.pipe.ts b/catalog-ui/src/app/ng2/pipes/contentAfterLastDot.pipe.ts index 68fba92b77..7aa184fc69 100644 --- a/catalog-ui/src/app/ng2/pipes/contentAfterLastDot.pipe.ts +++ b/catalog-ui/src/app/ng2/pipes/contentAfterLastDot.pipe.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Pipe, PipeTransform } from '@angular/core'; @Pipe({ name: 'contentAfterLastDot' }) @@ -5,4 +25,4 @@ export class ContentAfterLastDotPipe implements PipeTransform { transform(value:string): string { return value.split('.').pop(); } -} \ No newline at end of file +} diff --git a/catalog-ui/src/app/ng2/pipes/filterChildProperties.pipe.ts b/catalog-ui/src/app/ng2/pipes/filterChildProperties.pipe.ts index d2eaef0391..4520469594 100644 --- a/catalog-ui/src/app/ng2/pipes/filterChildProperties.pipe.ts +++ b/catalog-ui/src/app/ng2/pipes/filterChildProperties.pipe.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Pipe, PipeTransform } from '@angular/core'; import { DerivedFEProperty } from 'app/models'; @@ -15,4 +35,4 @@ export class FilterChildPropertiesPipe implements PipeTransform { } return childProperties.filter(derivedProp => validParents.indexOf(derivedProp.parentName) > -1); } -} \ No newline at end of file +} diff --git a/catalog-ui/src/app/ng2/pipes/groupBy.pipe.ts b/catalog-ui/src/app/ng2/pipes/groupBy.pipe.ts index 17ccc0ca75..90dce23352 100644 --- a/catalog-ui/src/app/ng2/pipes/groupBy.pipe.ts +++ b/catalog-ui/src/app/ng2/pipes/groupBy.pipe.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rc2122 on 5/17/2017. */ diff --git a/catalog-ui/src/app/ng2/pipes/keys.pipe.ts b/catalog-ui/src/app/ng2/pipes/keys.pipe.ts index 13bd26969c..349e9334f7 100644 --- a/catalog-ui/src/app/ng2/pipes/keys.pipe.ts +++ b/catalog-ui/src/app/ng2/pipes/keys.pipe.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Pipe, PipeTransform } from '@angular/core'; @Pipe({name: 'keys'}) diff --git a/catalog-ui/src/app/ng2/pipes/searchFilter.pipe.ts b/catalog-ui/src/app/ng2/pipes/searchFilter.pipe.ts index 3a0c85dda2..f20ba11c3d 100644 --- a/catalog-ui/src/app/ng2/pipes/searchFilter.pipe.ts +++ b/catalog-ui/src/app/ng2/pipes/searchFilter.pipe.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Pipe, PipeTransform } from '@angular/core'; @Pipe({ diff --git a/catalog-ui/src/app/ng2/services/authentication.service.ts b/catalog-ui/src/app/ng2/services/authentication.service.ts index 7fe3e22f4c..876385c832 100644 --- a/catalog-ui/src/app/ng2/services/authentication.service.ts +++ b/catalog-ui/src/app/ng2/services/authentication.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Injectable } from '@angular/core'; import { sdc2Config } from './../../../main'; import {IAppConfigurtaion, ICookie} from "../../models/app-config"; @@ -37,4 +57,4 @@ export class AuthenticationService { .map((res: Response) => res.json()); } -} \ No newline at end of file +} diff --git a/catalog-ui/src/app/ng2/services/component-instance-services/component-instance.service.ts b/catalog-ui/src/app/ng2/services/component-instance-services/component-instance.service.ts index fd7e7b62ce..0c499facff 100644 --- a/catalog-ui/src/app/ng2/services/component-instance-services/component-instance.service.ts +++ b/catalog-ui/src/app/ng2/services/component-instance-services/component-instance.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Injectable} from '@angular/core'; import {Response, RequestOptions, Headers} from '@angular/http'; import { Observable } from 'rxjs/Observable'; diff --git a/catalog-ui/src/app/ng2/services/component-mode.service.ts b/catalog-ui/src/app/ng2/services/component-mode.service.ts index 12a581e5f9..2e60f6ac57 100644 --- a/catalog-ui/src/app/ng2/services/component-mode.service.ts +++ b/catalog-ui/src/app/ng2/services/component-mode.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rc2122 on 5/23/2017. */ diff --git a/catalog-ui/src/app/ng2/services/component-services/component.service.ts b/catalog-ui/src/app/ng2/services/component-services/component.service.ts index 976d18eac3..c6865fde9d 100644 --- a/catalog-ui/src/app/ng2/services/component-services/component.service.ts +++ b/catalog-ui/src/app/ng2/services/component-services/component.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Injectable} from '@angular/core'; import {Observable} from 'rxjs/Observable'; import 'rxjs/add/operator/map'; diff --git a/catalog-ui/src/app/ng2/services/component-services/resource.service.ts b/catalog-ui/src/app/ng2/services/component-services/resource.service.ts index 650f244d38..699e762a60 100644 --- a/catalog-ui/src/app/ng2/services/component-services/resource.service.ts +++ b/catalog-ui/src/app/ng2/services/component-services/resource.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Injectable } from '@angular/core'; import 'rxjs/add/operator/map'; import 'rxjs/add/operator/toPromise'; diff --git a/catalog-ui/src/app/ng2/services/component-services/service.service.ts b/catalog-ui/src/app/ng2/services/component-services/service.service.ts index 147fe9385c..1f5de18c04 100644 --- a/catalog-ui/src/app/ng2/services/component-services/service.service.ts +++ b/catalog-ui/src/app/ng2/services/component-services/service.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; diff --git a/catalog-ui/src/app/ng2/services/config.service.ts b/catalog-ui/src/app/ng2/services/config.service.ts index 0ac3b5a397..cac850e91c 100644 --- a/catalog-ui/src/app/ng2/services/config.service.ts +++ b/catalog-ui/src/app/ng2/services/config.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by ob0695 on 4/9/2017. */ diff --git a/catalog-ui/src/app/ng2/services/cookie.service.ts b/catalog-ui/src/app/ng2/services/cookie.service.ts index 2dc2ac3e6b..e5f04f7afd 100644 --- a/catalog-ui/src/app/ng2/services/cookie.service.ts +++ b/catalog-ui/src/app/ng2/services/cookie.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Injectable } from '@angular/core'; import {IAppConfigurtaion, ICookie} from "../../models/app-config"; import {sdc2Config} from './../../../main'; diff --git a/catalog-ui/src/app/ng2/services/data-type.service.ts b/catalog-ui/src/app/ng2/services/data-type.service.ts index 821c215be5..48d32b7e69 100644 --- a/catalog-ui/src/app/ng2/services/data-type.service.ts +++ b/catalog-ui/src/app/ng2/services/data-type.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Injectable } from '@angular/core'; import { DataTypeModel, DataTypesMap, PropertyBEModel, PropertyFEModel, DerivedFEProperty, DerivedFEPropertyMap } from "app/models"; import { DataTypesService } from "app/services/data-types-service"; diff --git a/catalog-ui/src/app/ng2/services/hierarchy-nav.service.ts b/catalog-ui/src/app/ng2/services/hierarchy-nav.service.ts index 512505d7c6..016b04788e 100644 --- a/catalog-ui/src/app/ng2/services/hierarchy-nav.service.ts +++ b/catalog-ui/src/app/ng2/services/hierarchy-nav.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Injectable } from '@angular/core'; import { SimpleFlatProperty, PropertyFEModel, DerivedFEProperty } from 'app/models'; @@ -60,4 +80,4 @@ export class HierarchyNavService { } return tree; } -} \ No newline at end of file +} diff --git a/catalog-ui/src/app/ng2/services/http.interceptor.service.ts b/catalog-ui/src/app/ng2/services/http.interceptor.service.ts index 7a859097a9..e1653cf0bc 100644 --- a/catalog-ui/src/app/ng2/services/http.interceptor.service.ts +++ b/catalog-ui/src/app/ng2/services/http.interceptor.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import 'rxjs/add/operator/map'; import 'rxjs/add/operator/toPromise'; import 'rxjs/Rx'; diff --git a/catalog-ui/src/app/ng2/services/http.service.ts b/catalog-ui/src/app/ng2/services/http.service.ts index 92e8ced142..5cd5a10000 100644 --- a/catalog-ui/src/app/ng2/services/http.service.ts +++ b/catalog-ui/src/app/ng2/services/http.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Injectable} from '@angular/core'; import {Http, XHRBackend, RequestOptions, Request, RequestOptionsArgs, Response, Headers} from '@angular/http'; import {Observable} from 'rxjs/Observable'; diff --git a/catalog-ui/src/app/ng2/services/mocks/properties.mock.ts b/catalog-ui/src/app/ng2/services/mocks/properties.mock.ts index 0ce253e80b..3cf667bd40 100644 --- a/catalog-ui/src/app/ng2/services/mocks/properties.mock.ts +++ b/catalog-ui/src/app/ng2/services/mocks/properties.mock.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + // import { PropertiesResponse } from './../../services/responses/properties.response'; // // export const PROPERTIES_RESPONSE: PropertiesResponse = { @@ -11,6 +31,6 @@ export const COMPONENT_INSTANCE_RESPONSE: any = [{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.724ef51f-7595-4336-a8ef-b144e1c937da.contrailv2vlansubinterface5","name":"CP2","normalizedName":"cp2","componentUid":"724ef51f-7595-4336-a8ef-b144e1c937da","creationTime":1489586037851,"modificationTime":1489586037851,"posX":"549","posY":"531","propertyValueCounter":1,"inputValueCounter":1,"originType":"CP","customizationUUID":"0222925a-06c6-48ca-8573-13ba3b650539"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.8ac5a229-60d8-4d7f-8e0f-b630da55c3ae.ldsa_os27","name":"VF22","normalizedName":"vf22","componentUid":"8ac5a229-60d8-4d7f-8e0f-b630da55c3ae","creationTime":1489590640842,"modificationTime":1489590640842,"posX":"644","posY":"359","propertyValueCounter":1,"inputValueCounter":1,"originType":"VF","customizationUUID":"fb34e6a1-f0cc-42e3-853f-178fb122d670"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.00ac92c4-a0c5-4567-aefb-f2b7f3fecba9.vl4","name":"VL1","normalizedName":"vl1","componentUid":"00ac92c4-a0c5-4567-aefb-f2b7f3fecba9","creationTime":1489586006630,"modificationTime":1489586006630,"posX":"486","posY":"530","propertyValueCounter":1,"inputValueCounter":1,"originType":"VL","customizationUUID":"8d156a97-38ca-4637-a6a6-9268dd708431"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.39bf293d-2aa9-4596-b85d-a6fdef18aadc.newvf428","name":"VF11","normalizedName":"vf11","componentUid":"39bf293d-2aa9-4596-b85d-a6fdef18aadc","creationTime":1489590742501,"modificationTime":1489590742501,"posX":"350","posY":"76","propertyValueCounter":1,"inputValueCounter":1,"originType":"VF","customizationUUID":"253f646d-87d0-4b84-bc20-20343b6e28a2"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.f8f30484-5761-4de8-9de8-12f288ee0a54.contrailport7","name":"CP1","normalizedName":"cp1","componentUid":"f8f30484-5761-4de8-9de8-12f288ee0a54","creationTime":1489587207447,"modificationTime":1489587207447,"posX":"418","posY":"531","propertyValueCounter":1,"inputValueCounter":1,"originType":"CP","customizationUUID":"206b4ffa-e520-496a-b57b-0c103eff8c17"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.16022d8c-80cf-46e5-a730-5b4f634ea905.extcp38","name":"ExtCP 38","normalizedName":"extcp38","componentUid":"16022d8c-80cf-46e5-a730-5b4f634ea905","creationTime":1489654844116,"modificationTime":1489654844116,"posX":"473","posY":"419","propertyValueCounter":5,"inputValueCounter":1,"originType":"CP","customizationUUID":"21ebc94a-65b9-463e-b696-07cea08f789a"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.f8f30484-5761-4de8-9de8-12f288ee0a54.contrailport44","name":"ContrailPort 44","normalizedName":"contrailport44","componentUid":"f8f30484-5761-4de8-9de8-12f288ee0a54","creationTime":1489939897435,"modificationTime":1489939897435,"posX":"480","posY":"265","propertyValueCounter":1,"inputValueCounter":1,"originType":"CP","customizationUUID":"607e5819-fa19-4aac-97f6-04f092493a02"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.8ac5a229-60d8-4d7f-8e0f-b630da55c3ae.ldsa_os6","name":"VF2","normalizedName":"vf2","componentUid":"8ac5a229-60d8-4d7f-8e0f-b630da55c3ae","creationTime":1489586613957,"modificationTime":1489586613957,"posX":"638","posY":"531","propertyValueCounter":1,"inputValueCounter":1,"originType":"VF","customizationUUID":"12501356-44cc-427b-8749-c114d3434271"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.8ac5a229-60d8-4d7f-8e0f-b630da55c3ae.ldsa_os8","name":"VF1","normalizedName":"vf1","componentUid":"8ac5a229-60d8-4d7f-8e0f-b630da55c3ae","creationTime":1489587393612,"modificationTime":1489587393612,"posX":"334","posY":"529","propertyValueCounter":1,"inputValueCounter":1,"originType":"VF","customizationUUID":"cbca1972-e64c-4119-a430-ec90aa1397a7"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.8ac5a229-60d8-4d7f-8e0f-b630da55c3ae.ldsa_os32","name":"VF12","normalizedName":"vf12","componentUid":"8ac5a229-60d8-4d7f-8e0f-b630da55c3ae","creationTime":1489591429630,"modificationTime":1489591429630,"posX":"367","posY":"269","propertyValueCounter":1,"inputValueCounter":1,"originType":"VF","customizationUUID":"ac9c77c1-e84d-4967-9ea2-d929b56d10a8"}]; -export const COMPONENT_INPUT_RESPONSE: any = [{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.extcp38_mac_requirements_mac_range_plan","type":"string","required":true,"definition":false,"description":"reference to a MAC address range plan","password":false,"name":"extcp38_mac_requirements_mac_range_plan","parentUniqueId":"23b78e64-1734-4898-889d-eab9eba50019"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.extcp38_order","type":"integer","required":true,"definition":false,"description":"The order of the CP on the compute instance (e.g. eth2).","schema":{"property":{"definition":true,"password":false}},"password":false,"name":"extcp38_order","parentUniqueId":"23b78e64-1734-4898-889d-eab9eba50019"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.extcp38_network_role_tag","type":"string","required":true,"definition":false,"description":"Must correlate to the set of defined “network-role” tag identifiers from the associated HEAT template","schema":{"property":{"definition":true,"password":false}},"password":false,"name":"extcp38_network_role_tag","parentUniqueId":"23b78e64-1734-4898-889d-eab9eba50019"}]; +export const COMPONENT_INPUT_RESPONSE: any = [{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.extcp38_mac_requirements_mac_range_plan","type":"string","required":true,"definition":false,"description":"reference to a MAC address range plan","password":false,"name":"extcp38_mac_requirements_mac_range_plan","parentUniqueId":"23b78e64-1734-4898-889d-eab9eba50019"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.extcp38_order","type":"integer","required":true,"definition":false,"description":"The order of the CP on the compute instance (e.g. eth2).","schema":{"property":{"definition":true,"password":false}},"password":false,"name":"extcp38_order","parentUniqueId":"23b78e64-1734-4898-889d-eab9eba50019"},{"uniqueId":"23b78e64-1734-4898-889d-eab9eba50019.extcp38_network_role_tag","type":"string","required":true,"definition":false,"description":"Must correlate to the set of defined “network-roleâ€? tag identifiers from the associated HEAT template","schema":{"property":{"definition":true,"password":false}},"password":false,"name":"extcp38_network_role_tag","parentUniqueId":"23b78e64-1734-4898-889d-eab9eba50019"}]; export const COMPONENT_PROPERTIES_RESPONSE: any =[{"schema":{"property":{"password":false,"definition":false}},"password":false,"parentUniqueId":"b80765f0-ef2b-43b1-b658-04e13970b5cf","defaultValue":"{\"naming_policy\":\"ggg\",\"ecomp_generated_naming\":false,\"supplemental_data\":{\"fff\":\"44\",\"uuu\":\"56\"}}","name":"inner-map-1","definition":false,"type":"org.openecomp.datatypes.EcompNaming","uniqueId":"property.b80765f0-ef2b-43b1-b658-04e13970b5cf.inner-map-1","required":false},{"schema":{"property":{"password":false,"definition":false}},"password":false,"parentUniqueId":"b80765f0-ef2b-43b1-b658-04e13970b5cf","defaultValue":"{\"min_subnets_count\":1,\"supplemental_data\":{\"aa\":\"11\",\"bb\":\"22\"},\"cidr_mask\":23,\"dhcp_enabled\":false,\"ip_version\":3}","name":"inner-simple-map","definition":false,"type":"org.openecomp.datatypes.network.IPv4SubnetAssignments","uniqueId":"property.b80765f0-ef2b-43b1-b658-04e13970b5cf.inner-simple-map","required":false},{"schema":{"property":{"password":false,"definition":false,"type":"org.openecomp.datatypes.heat.network.AddressPair"}},"password":false,"parentUniqueId":"b80765f0-ef2b-43b1-b658-04e13970b5cf","defaultValue":"{\"aaa\":{\"mac_address\":\"34\",\"ip_address\":\"56\"},\"bbb\":{\"mac_address\":\"sddf\",\"ip_address\":\"dfdg\"}}","name":"data-type-map","definition":false,"type":"map","uniqueId":"property.b80765f0-ef2b-43b1-b658-04e13970b5cf.data-type-map","required":false},{"schema":{"property":{"password":false,"definition":false,"type":"string"}},"password":false,"parentUniqueId":"b80765f0-ef2b-43b1-b658-04e13970b5cf","defaultValue":"{\"www\":\"dfsdf\",\"aaaa\":\"ert\"}","name":"simple-map","definition":false,"type":"map","uniqueId":"property.b80765f0-ef2b-43b1-b658-04e13970b5cf.simple-map","required":false}]; diff --git a/catalog-ui/src/app/ng2/services/properties.service.ts b/catalog-ui/src/app/ng2/services/properties.service.ts index 3a02e503fa..6f15de858a 100644 --- a/catalog-ui/src/app/ng2/services/properties.service.ts +++ b/catalog-ui/src/app/ng2/services/properties.service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Injectable } from '@angular/core'; import { DataTypeModel, PropertyFEModel, PropertyBEModel, SchemaProperty, PropertyDeclareAPIModel, DerivedFEProperty, DerivedFEPropertyMap, DerivedPropertyType, InputFEModel} from "app/models"; import { DataTypeService } from "./data-type.service"; @@ -65,4 +85,4 @@ export class PropertiesService { } -} \ No newline at end of file +} diff --git a/catalog-ui/src/app/ng2/services/responses/component-generic-response.ts b/catalog-ui/src/app/ng2/services/responses/component-generic-response.ts index 38e23a58f3..9450e4bc04 100644 --- a/catalog-ui/src/app/ng2/services/responses/component-generic-response.ts +++ b/catalog-ui/src/app/ng2/services/responses/component-generic-response.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by ob0695 on 4/18/2017. */ diff --git a/catalog-ui/src/app/ng2/services/responses/properties.response.ts b/catalog-ui/src/app/ng2/services/responses/properties.response.ts index a3d82500eb..a1c0660c0f 100644 --- a/catalog-ui/src/app/ng2/services/responses/properties.response.ts +++ b/catalog-ui/src/app/ng2/services/responses/properties.response.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class PropertiesResponse { properties: Array; } diff --git a/catalog-ui/src/app/ng2/services/utils/serializable.ts b/catalog-ui/src/app/ng2/services/utils/serializable.ts index f8be120613..465bc1d520 100644 --- a/catalog-ui/src/app/ng2/services/utils/serializable.ts +++ b/catalog-ui/src/app/ng2/services/utils/serializable.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by ob0695 on 4/26/2017. */ diff --git a/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.ts b/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.ts index c1bb28b6ff..c8da016174 100644 --- a/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.ts +++ b/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, Input, Output, EventEmitter, ViewEncapsulation } from '@angular/core'; //import { trigger, state, style, transition, animate, keyframes } from '@angular/core'; diff --git a/catalog-ui/src/app/ng2/shared/checkbox/checkbox.module.ts b/catalog-ui/src/app/ng2/shared/checkbox/checkbox.module.ts index 116aa7f025..4ac7f2d7cd 100644 --- a/catalog-ui/src/app/ng2/shared/checkbox/checkbox.module.ts +++ b/catalog-ui/src/app/ng2/shared/checkbox/checkbox.module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; @@ -25,4 +45,4 @@ export class CheckboxModule { } * * To create or override styles: * Use /deep/ or >>> prefix to override styles via other components stylesheets - */ \ No newline at end of file + */ diff --git a/catalog-ui/src/app/ng2/shared/navbar/navbar-routes.config.ts b/catalog-ui/src/app/ng2/shared/navbar/navbar-routes.config.ts index d8a21e66c8..ac58cbd063 100644 --- a/catalog-ui/src/app/ng2/shared/navbar/navbar-routes.config.ts +++ b/catalog-ui/src/app/ng2/shared/navbar/navbar-routes.config.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { MenuType, RouteInfo } from './navbar.metadata'; export const ROUTES: RouteInfo[] = [ diff --git a/catalog-ui/src/app/ng2/shared/navbar/navbar.component.ts b/catalog-ui/src/app/ng2/shared/navbar/navbar.component.ts index b174f9d18d..68a26c4780 100644 --- a/catalog-ui/src/app/ng2/shared/navbar/navbar.component.ts +++ b/catalog-ui/src/app/ng2/shared/navbar/navbar.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Component, OnInit, ViewEncapsulation} from '@angular/core'; import { ROUTES } from './navbar-routes.config'; import { MenuType, RouteInfo } from './navbar.metadata'; diff --git a/catalog-ui/src/app/ng2/shared/navbar/navbar.metadata.ts b/catalog-ui/src/app/ng2/shared/navbar/navbar.metadata.ts index 245d0e6cfe..71cc3cb59f 100644 --- a/catalog-ui/src/app/ng2/shared/navbar/navbar.metadata.ts +++ b/catalog-ui/src/app/ng2/shared/navbar/navbar.metadata.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export enum MenuType { BRAND, LEFT, diff --git a/catalog-ui/src/app/ng2/shared/navbar/navbar.module.ts b/catalog-ui/src/app/ng2/shared/navbar/navbar.module.ts index 18120a61fb..4a754dfe99 100644 --- a/catalog-ui/src/app/ng2/shared/navbar/navbar.module.ts +++ b/catalog-ui/src/app/ng2/shared/navbar/navbar.module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; diff --git a/catalog-ui/src/app/ng2/shared/shared.module.ts b/catalog-ui/src/app/ng2/shared/shared.module.ts index 3e59e04441..2bc7d52ab8 100644 --- a/catalog-ui/src/app/ng2/shared/shared.module.ts +++ b/catalog-ui/src/app/ng2/shared/shared.module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; diff --git a/catalog-ui/src/app/ng2/shared/tabs/tab/tab.component.ts b/catalog-ui/src/app/ng2/shared/tabs/tab/tab.component.ts index 06dcfa0b16..bad7b80a51 100644 --- a/catalog-ui/src/app/ng2/shared/tabs/tab/tab.component.ts +++ b/catalog-ui/src/app/ng2/shared/tabs/tab/tab.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, Input } from '@angular/core'; import { ViewEncapsulation } from '@angular/core'; @@ -15,4 +35,4 @@ export class Tab { @Input() active:boolean = false; @Input() indication?: number; -} \ No newline at end of file +} diff --git a/catalog-ui/src/app/ng2/shared/tabs/tabs.component.ts b/catalog-ui/src/app/ng2/shared/tabs/tabs.component.ts index dc5616c6cb..21d2bbad43 100644 --- a/catalog-ui/src/app/ng2/shared/tabs/tabs.component.ts +++ b/catalog-ui/src/app/ng2/shared/tabs/tabs.component.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, ContentChildren, QueryList, AfterContentInit, Input, Output, EventEmitter } from '@angular/core'; import { Tab } from './tab/tab.component'; import { ViewEncapsulation } from '@angular/core'; diff --git a/catalog-ui/src/app/ng2/shared/tabs/tabs.module.ts b/catalog-ui/src/app/ng2/shared/tabs/tabs.module.ts index 36c7335fde..6bf19d4099 100644 --- a/catalog-ui/src/app/ng2/shared/tabs/tabs.module.ts +++ b/catalog-ui/src/app/ng2/shared/tabs/tabs.module.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import { Component, NgModule } from '@angular/core' import { BrowserModule } from '@angular/platform-browser' @@ -32,4 +52,4 @@ export class TabModule { } * To create or override styles: * Parent div has class ".tabs". Each tab has class ".tab". Active tab has class ".active". * Use /deep/ or >>> prefix to override styles via other components stylesheets - */ \ No newline at end of file + */ diff --git a/catalog-ui/src/app/ng2/utils/ng1-upgraded-provider.ts b/catalog-ui/src/app/ng2/utils/ng1-upgraded-provider.ts index ed1ecd87bd..ce13a8c235 100644 --- a/catalog-ui/src/app/ng2/utils/ng1-upgraded-provider.ts +++ b/catalog-ui/src/app/ng2/utils/ng1-upgraded-provider.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rc2122 on 4/6/2017. */ diff --git a/catalog-ui/src/app/services.ts b/catalog-ui/src/app/services.ts index 5b4358a90c..ce4a8e32d3 100644 --- a/catalog-ui/src/app/services.ts +++ b/catalog-ui/src/app/services.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by ob0695 on 2/23/2017. */ diff --git a/catalog-ui/src/app/services/activity-log-service.ts b/catalog-ui/src/app/services/activity-log-service.ts index 565dc9a39c..97d26d4f44 100644 --- a/catalog-ui/src/app/services/activity-log-service.ts +++ b/catalog-ui/src/app/services/activity-log-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {Activity} from "../models/activity"; import {IAppConfigurtaion, IApi} from "../models/app-config"; diff --git a/catalog-ui/src/app/services/angular-js-bridge-service.ts b/catalog-ui/src/app/services/angular-js-bridge-service.ts index 1eaea878dd..7b4c5568cd 100644 --- a/catalog-ui/src/app/services/angular-js-bridge-service.ts +++ b/catalog-ui/src/app/services/angular-js-bridge-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IAppConfigurtaion} from "../models/app-config"; diff --git a/catalog-ui/src/app/services/available-icons-service.ts b/catalog-ui/src/app/services/available-icons-service.ts index ad17b069d6..ebb6c5ff77 100644 --- a/catalog-ui/src/app/services/available-icons-service.ts +++ b/catalog-ui/src/app/services/available-icons-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 2/23/2016. */ diff --git a/catalog-ui/src/app/services/cache-service.ts b/catalog-ui/src/app/services/cache-service.ts index 9ee08c8478..4d10db0066 100644 --- a/catalog-ui/src/app/services/cache-service.ts +++ b/catalog-ui/src/app/services/cache-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {Dictionary} from "app/utils"; diff --git a/catalog-ui/src/app/services/category-resource-service.ts b/catalog-ui/src/app/services/category-resource-service.ts index a2e3c61e0a..443fd706f8 100644 --- a/catalog-ui/src/app/services/category-resource-service.ts +++ b/catalog-ui/src/app/services/category-resource-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; // import 'angular-resource'; import {IAppConfigurtaion, IMainCategory, IUserProperties} from "../models"; diff --git a/catalog-ui/src/app/services/components/component-service.ts b/catalog-ui/src/app/services/components/component-service.ts index 7e031baa08..bedfed5ee5 100644 --- a/catalog-ui/src/app/services/components/component-service.ts +++ b/catalog-ui/src/app/services/components/component-service.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/services/components/product-service.ts b/catalog-ui/src/app/services/components/product-service.ts index c1a14478d2..09199ea172 100644 --- a/catalog-ui/src/app/services/components/product-service.ts +++ b/catalog-ui/src/app/services/components/product-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 2/8/2016. */ diff --git a/catalog-ui/src/app/services/components/resource-service.ts b/catalog-ui/src/app/services/components/resource-service.ts index 470f1e2061..472775e50d 100644 --- a/catalog-ui/src/app/services/components/resource-service.ts +++ b/catalog-ui/src/app/services/components/resource-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 2/4/2016. */ diff --git a/catalog-ui/src/app/services/components/service-service.ts b/catalog-ui/src/app/services/components/service-service.ts index f0fe90bf7f..f92f5699dc 100644 --- a/catalog-ui/src/app/services/components/service-service.ts +++ b/catalog-ui/src/app/services/components/service-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 2/4/2016. */ diff --git a/catalog-ui/src/app/services/components/utils/composition-left-palette-service.ts b/catalog-ui/src/app/services/components/utils/composition-left-palette-service.ts index 0abdbcfcb3..52cb78f6d5 100644 --- a/catalog-ui/src/app/services/components/utils/composition-left-palette-service.ts +++ b/catalog-ui/src/app/services/components/utils/composition-left-palette-service.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/services/configuration-ui-service.ts b/catalog-ui/src/app/services/configuration-ui-service.ts index 92da0a50ed..766df7a722 100644 --- a/catalog-ui/src/app/services/configuration-ui-service.ts +++ b/catalog-ui/src/app/services/configuration-ui-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict' import {IAppConfigurtaion, IApi} from "../models/app-config"; diff --git a/catalog-ui/src/app/services/cookie-service.ts b/catalog-ui/src/app/services/cookie-service.ts index 8f88835c18..fad9252e04 100644 --- a/catalog-ui/src/app/services/cookie-service.ts +++ b/catalog-ui/src/app/services/cookie-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IAppConfigurtaion, ICookie} from "../models/app-config"; diff --git a/catalog-ui/src/app/services/data-types-service.ts b/catalog-ui/src/app/services/data-types-service.ts index 1c6ac07fdc..a6dbf7f12d 100644 --- a/catalog-ui/src/app/services/data-types-service.ts +++ b/catalog-ui/src/app/services/data-types-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import { DataTypePropertyModel } from "../models/data-type-properties"; import {ComponentInstance, InputModel, DataTypesMap, PropertyModel, InputPropertyBase, IAppConfigurtaion, SchemaProperty} from "../models"; diff --git a/catalog-ui/src/app/services/ecomp-service.ts b/catalog-ui/src/app/services/ecomp-service.ts index 2703a50fc3..c8ed31a0bc 100644 --- a/catalog-ui/src/app/services/ecomp-service.ts +++ b/catalog-ui/src/app/services/ecomp-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IAppConfigurtaion, IApi} from "../models/app-config"; diff --git a/catalog-ui/src/app/services/entity-service.ts b/catalog-ui/src/app/services/entity-service.ts index d480bf9104..a255dcff34 100644 --- a/catalog-ui/src/app/services/entity-service.ts +++ b/catalog-ui/src/app/services/entity-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {Product, Service, IApi, IAppConfigurtaion, Resource, Component} from "../models"; import {SharingService} from "./sharing-service"; diff --git a/catalog-ui/src/app/services/event-listener-service.ts b/catalog-ui/src/app/services/event-listener-service.ts index 51aa857e51..1c796230c6 100644 --- a/catalog-ui/src/app/services/event-listener-service.ts +++ b/catalog-ui/src/app/services/event-listener-service.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/services/header-interceptor.ts b/catalog-ui/src/app/services/header-interceptor.ts index a1e79934d8..931b292d60 100644 --- a/catalog-ui/src/app/services/header-interceptor.ts +++ b/catalog-ui/src/app/services/header-interceptor.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IAppConfigurtaion} from "../models/app-config"; import {Dictionary} from "../utils/dictionary/dictionary"; diff --git a/catalog-ui/src/app/services/http-error-interceptor.ts b/catalog-ui/src/app/services/http-error-interceptor.ts index b61091c37c..b1aa16a2ac 100644 --- a/catalog-ui/src/app/services/http-error-interceptor.ts +++ b/catalog-ui/src/app/services/http-error-interceptor.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IServerMessageModalModel} from "../view-models/modals/message-modal/message-server-modal/server-message-modal-view-model"; import {SEVERITY} from "../utils/constants"; diff --git a/catalog-ui/src/app/services/loader-service.ts b/catalog-ui/src/app/services/loader-service.ts index 4bf8a6afe0..2f8746cbd8 100644 --- a/catalog-ui/src/app/services/loader-service.ts +++ b/catalog-ui/src/app/services/loader-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 3/13/2016. */ diff --git a/catalog-ui/src/app/services/onboarding-service.ts b/catalog-ui/src/app/services/onboarding-service.ts index 8b93b18ca9..db6c72699a 100644 --- a/catalog-ui/src/app/services/onboarding-service.ts +++ b/catalog-ui/src/app/services/onboarding-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {Component, IComponent} from "../models/components/component"; import {ICsarComponent} from "../models/csar-component"; diff --git a/catalog-ui/src/app/services/progress-service.ts b/catalog-ui/src/app/services/progress-service.ts index 59ae16d734..da8c71947e 100644 --- a/catalog-ui/src/app/services/progress-service.ts +++ b/catalog-ui/src/app/services/progress-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 7/7/2016. */ diff --git a/catalog-ui/src/app/services/sdc-version-service.ts b/catalog-ui/src/app/services/sdc-version-service.ts index 47001e9c9c..6ab867e4f4 100644 --- a/catalog-ui/src/app/services/sdc-version-service.ts +++ b/catalog-ui/src/app/services/sdc-version-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {Distribution} from "../models/distribution"; import {IAppConfigurtaion, IApi} from "../models/app-config"; diff --git a/catalog-ui/src/app/services/sharing-service.ts b/catalog-ui/src/app/services/sharing-service.ts index 706f01f16b..f4cc2e6d5d 100644 --- a/catalog-ui/src/app/services/sharing-service.ts +++ b/catalog-ui/src/app/services/sharing-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {Dictionary} from "app/utils"; diff --git a/catalog-ui/src/app/services/url-tobase64-service.ts b/catalog-ui/src/app/services/url-tobase64-service.ts index 4e8dc18c7f..7c90a582ee 100644 --- a/catalog-ui/src/app/services/url-tobase64-service.ts +++ b/catalog-ui/src/app/services/url-tobase64-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IUrlToBase64Service { diff --git a/catalog-ui/src/app/services/user-resource-service.ts b/catalog-ui/src/app/services/user-resource-service.ts index b881e3a98a..bdd9fc3303 100644 --- a/catalog-ui/src/app/services/user-resource-service.ts +++ b/catalog-ui/src/app/services/user-resource-service.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IUserProperties} from "../models/user"; import {ICookie, IAppConfigurtaion} from "../models/app-config"; diff --git a/catalog-ui/src/app/utils.ts b/catalog-ui/src/app/utils.ts index 734c276c56..1d2eafb9fb 100644 --- a/catalog-ui/src/app/utils.ts +++ b/catalog-ui/src/app/utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by ob0695 on 2/23/2017. */ diff --git a/catalog-ui/src/app/utils/artifacts-utils.ts b/catalog-ui/src/app/utils/artifacts-utils.ts index b52fe6f03e..d6ea616c1e 100644 --- a/catalog-ui/src/app/utils/artifacts-utils.ts +++ b/catalog-ui/src/app/utils/artifacts-utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {ArtifactModel} from "../models/artifacts"; import {IArtifactResourceFormViewModelScope} from "../view-models/forms/artifact-form/artifact-form-view-model"; import {Component} from "../models/components/component"; diff --git a/catalog-ui/src/app/utils/change-lifecycle-state-handler.ts b/catalog-ui/src/app/utils/change-lifecycle-state-handler.ts index dc59e3bb98..d32730d630 100644 --- a/catalog-ui/src/app/utils/change-lifecycle-state-handler.ts +++ b/catalog-ui/src/app/utils/change-lifecycle-state-handler.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {ComponentFactory} from "./component-factory"; import {Component, Service,IAppMenu, IAppConfigurtaion} from "../models"; import {IEmailModalModel, IEmailModalModel_Email, IEmailModalModel_Data} from "../view-models/modals/email-modal/email-modal-view-model"; diff --git a/catalog-ui/src/app/utils/common-utils.ts b/catalog-ui/src/app/utils/common-utils.ts index acfbd80ff4..1719034354 100644 --- a/catalog-ui/src/app/utils/common-utils.ts +++ b/catalog-ui/src/app/utils/common-utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {Module, AttributeModel, ResourceInstance, PropertyModel, InputFEModel} from "../models"; import {ComponentInstanceFactory} from "./component-instance-factory"; import {InputBEModel, PropertyBEModel, RelationshipModel} from "app/models"; diff --git a/catalog-ui/src/app/utils/component-factory.ts b/catalog-ui/src/app/utils/component-factory.ts index 13f1d761f2..c202a1c8f5 100644 --- a/catalog-ui/src/app/utils/component-factory.ts +++ b/catalog-ui/src/app/utils/component-factory.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {DEFAULT_ICON, ResourceType, ComponentType} from "./constants"; import {ServiceService, CacheService, ResourceService, ProductService} from "app/services"; diff --git a/catalog-ui/src/app/utils/component-instance-factory.ts b/catalog-ui/src/app/utils/component-instance-factory.ts index df92f20c90..c020c53705 100644 --- a/catalog-ui/src/app/utils/component-instance-factory.ts +++ b/catalog-ui/src/app/utils/component-instance-factory.ts @@ -7,9 +7,9 @@ * 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. diff --git a/catalog-ui/src/app/utils/constants.ts b/catalog-ui/src/app/utils/constants.ts index 0f4fde2ff4..636c0c4fbf 100644 --- a/catalog-ui/src/app/utils/constants.ts +++ b/catalog-ui/src/app/utils/constants.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 2/18/2016. */ diff --git a/catalog-ui/src/app/utils/dictionary/dictionary.ts b/catalog-ui/src/app/utils/dictionary/dictionary.ts index fd2a028c34..d6c0ff3c3c 100644 --- a/catalog-ui/src/app/utils/dictionary/dictionary.ts +++ b/catalog-ui/src/app/utils/dictionary/dictionary.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** This code was copy from collections.ts lib diff --git a/catalog-ui/src/app/utils/file-utils.ts b/catalog-ui/src/app/utils/file-utils.ts index d8c18229c3..d726736bd4 100644 --- a/catalog-ui/src/app/utils/file-utils.ts +++ b/catalog-ui/src/app/utils/file-utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class FileUtils { static '$inject' = [ diff --git a/catalog-ui/src/app/utils/functions.ts b/catalog-ui/src/app/utils/functions.ts index 24f8008393..cdf6190f9f 100644 --- a/catalog-ui/src/app/utils/functions.ts +++ b/catalog-ui/src/app/utils/functions.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + export class QueueUtils { private executionQueue:any; diff --git a/catalog-ui/src/app/utils/menu-handler.ts b/catalog-ui/src/app/utils/menu-handler.ts index 1dc5a203e2..351311a48f 100644 --- a/catalog-ui/src/app/utils/menu-handler.ts +++ b/catalog-ui/src/app/utils/menu-handler.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {WorkspaceMode, ComponentState} from "./constants"; import {IAppConfigurtaion, IAppMenu, Component} from "../models"; diff --git a/catalog-ui/src/app/utils/modals-handler.ts b/catalog-ui/src/app/utils/modals-handler.ts index c6d1d36fc7..ae91b2acb7 100644 --- a/catalog-ui/src/app/utils/modals-handler.ts +++ b/catalog-ui/src/app/utils/modals-handler.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + import {PropertyModel, Component, ArtifactModel, Distribution, InputModel, DisplayModule, InputPropertyBase} from "../models"; import {IEmailModalModel} from "../view-models/modals/email-modal/email-modal-view-model"; import {IClientMessageModalModel} from "../view-models/modals/message-modal/message-client-modal/client-message-modal-view-model"; diff --git a/catalog-ui/src/app/utils/prototypes.ts b/catalog-ui/src/app/utils/prototypes.ts index 2aa718a06c..ce85680d9b 100644 --- a/catalog-ui/src/app/utils/prototypes.ts +++ b/catalog-ui/src/app/utils/prototypes.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + interface String { format(variables:Array):string } diff --git a/catalog-ui/src/app/utils/validation-utils.ts b/catalog-ui/src/app/utils/validation-utils.ts index 9246d3350d..6b45149b1e 100644 --- a/catalog-ui/src/app/utils/validation-utils.ts +++ b/catalog-ui/src/app/utils/validation-utils.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + class basePattern { pattern:RegExp; base:number; diff --git a/catalog-ui/src/app/view-models/admin-dashboard/add-category-modal/add-category-modal-view-model.ts b/catalog-ui/src/app/view-models/admin-dashboard/add-category-modal/add-category-modal-view-model.ts index c421e632da..aca8e908a4 100644 --- a/catalog-ui/src/app/view-models/admin-dashboard/add-category-modal/add-category-modal-view-model.ts +++ b/catalog-ui/src/app/view-models/admin-dashboard/add-category-modal/add-category-modal-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ICategoryResourceClass, ICategoryResource} from "../../../services/category-resource-service"; diff --git a/catalog-ui/src/app/view-models/admin-dashboard/admin-dashboard-view-model.ts b/catalog-ui/src/app/view-models/admin-dashboard/admin-dashboard-view-model.ts index c8503bce42..c9ffe470f0 100644 --- a/catalog-ui/src/app/view-models/admin-dashboard/admin-dashboard-view-model.ts +++ b/catalog-ui/src/app/view-models/admin-dashboard/admin-dashboard-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {CacheService} from "app/services"; import {IAppConfigurtaion} from "app/models"; diff --git a/catalog-ui/src/app/view-models/admin-dashboard/category-management/category-management-view-model.ts b/catalog-ui/src/app/view-models/admin-dashboard/category-management/category-management-view-model.ts index 61558252e0..c99f9e874d 100644 --- a/catalog-ui/src/app/view-models/admin-dashboard/category-management/category-management-view-model.ts +++ b/catalog-ui/src/app/view-models/admin-dashboard/category-management/category-management-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ModalsHandler, ValidationUtils} from "app/utils"; import {CacheService, ICategoryResource} from "app/services"; diff --git a/catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view-model.ts b/catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view-model.ts index 82cc3a74da..e1f3a50b44 100644 --- a/catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view-model.ts +++ b/catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ModalsHandler} from "app/utils"; import {IUserResource, IUserResourceClass} from "app/services"; diff --git a/catalog-ui/src/app/view-models/catalog/catalog-view-model.ts b/catalog-ui/src/app/view-models/catalog/catalog-view-model.ts index 0e7e4aaeae..8925be0fff 100644 --- a/catalog-ui/src/app/view-models/catalog/catalog-view-model.ts +++ b/catalog-ui/src/app/view-models/catalog/catalog-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {Component, IMainCategory, IGroup, IConfigStatuses, IAppMenu, IAppConfigurtaion, IUserProperties, ISubCategory} from "app/models"; import {EntityService, IUserResourceClass, CacheService} from "app/services"; diff --git a/catalog-ui/src/app/view-models/catalog/catalog.less b/catalog-ui/src/app/view-models/catalog/catalog.less index 9db9192167..ff50202243 100644 --- a/catalog-ui/src/app/view-models/catalog/catalog.less +++ b/catalog-ui/src/app/view-models/catalog/catalog.less @@ -9,10 +9,29 @@ padding: 0; margin: 0; + .i-sdc-designer-leftbar-section-content-ul-li { + margin-top: 5px; + + .tlv-checkbox { + font-size: 13px; + font-family: @font-opensans-medium; + color: @func_color_s; + } + } + .i-sdc-catalog-subcategories-checkbox { padding: 0 0 0 20px; margin: 0; + > li { + margin-top: 5px; + + .tlv-checkbox { + font-size:13px; + font-family: @font-opensans-regular; + } + } + .i-sdc-catalog-grouping-checkbox { padding: 0 0 0 20px; margin: 0; @@ -163,7 +182,7 @@ padding: 10px 12px; } .w-sdc-dashboard-catalog-header { - .b_9; + .b_3; display: inline-block; font-style: italic; font-weight: bold; @@ -171,28 +190,28 @@ } .w-sdc-dashboard-catalog-header-order { - .b_9; + .b_3; font-weight: 800; } .w-sdc-dashboard-catalog-sort { - .b_9; + .b_3; font-weight: bold; white-space:pre; &:hover{ .hand; text-decoration: none; - .a_9; + .a_3; } &.blue { - .a_9; + .a_3; } } .w-sdc-catalog-sort-arrow{ display: inline-block; &.up{ - .b_9; + .b_3; width: 0; height: 0; border-left: 5px solid transparent; @@ -200,7 +219,7 @@ border-bottom: 5px solid ; } &.down{ - .b_9; + .b_3; width: 0; height: 0; border-left: 5px solid transparent; diff --git a/catalog-ui/src/app/view-models/dashboard/dashboard-view-model.ts b/catalog-ui/src/app/view-models/dashboard/dashboard-view-model.ts index d0b74a9062..b9e51f098a 100644 --- a/catalog-ui/src/app/view-models/dashboard/dashboard-view-model.ts +++ b/catalog-ui/src/app/view-models/dashboard/dashboard-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IConfigRoles, IAppConfigurtaion, IAppMenu, IUserProperties, Component} from "app/models"; import {EntityService, IUserResourceClass, SharingService, CacheService} from "app/services"; diff --git a/catalog-ui/src/app/view-models/dcae-app/dcae-app-view-model.ts b/catalog-ui/src/app/view-models/dcae-app/dcae-app-view-model.ts index 9be7786f4d..d21011d4b3 100644 --- a/catalog-ui/src/app/view-models/dcae-app/dcae-app-view-model.ts +++ b/catalog-ui/src/app/view-models/dcae-app/dcae-app-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {MenuItemGroup, MenuItem} from "app/utils"; import {BreadcrumbsPath, BreadcrumbsMenu} from "../onboard-vendor/onboard-vendor-view-model"; diff --git a/catalog-ui/src/app/view-models/dcae-app/dcae-app.less b/catalog-ui/src/app/view-models/dcae-app/dcae-app.less index 4a16ca2b5b..bc1404d7c4 100644 --- a/catalog-ui/src/app/view-models/dcae-app/dcae-app.less +++ b/catalog-ui/src/app/view-models/dcae-app/dcae-app.less @@ -163,7 +163,7 @@ padding: 10px 12px; } .w-sdc-dashboard-catalog-header { - .b_9; + .b_3; display: inline-block; font-style: italic; font-weight: bold; @@ -171,28 +171,28 @@ } .w-sdc-dashboard-catalog-header-order { - .b_9; + .b_3; font-weight: 800; } .w-sdc-dashboard-catalog-sort { - .b_9; + .b_3; font-weight: bold; white-space:pre; &:hover{ .hand; text-decoration: none; - .a_9; + .a_3; } &.blue { - .a_9; + .a_3; } } .w-sdc-catalog-sort-arrow{ display: inline-block; &.up{ - .b_9; + .b_3; width: 0; height: 0; border-left: 5px solid transparent; @@ -200,7 +200,7 @@ border-bottom: 5px solid ; } &.down{ - .b_9; + .b_3; width: 0; height: 0; border-left: 5px solid transparent; diff --git a/catalog-ui/src/app/view-models/forms/artifact-form/artifact-form-view-model.ts b/catalog-ui/src/app/view-models/forms/artifact-form/artifact-form-view-model.ts index 3e912706e0..1306565016 100644 --- a/catalog-ui/src/app/view-models/forms/artifact-form/artifact-form-view-model.ts +++ b/catalog-ui/src/app/view-models/forms/artifact-form/artifact-form-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ArtifactModel, Resource, Component} from "app/models"; import {ArtifactsUtils, FormState, ValidationUtils, ArtifactType} from "app/utils"; diff --git a/catalog-ui/src/app/view-models/forms/attribute-form/attribute-from-view-model.ts b/catalog-ui/src/app/view-models/forms/attribute-form/attribute-from-view-model.ts index 122cf10ed2..4c114b16e6 100644 --- a/catalog-ui/src/app/view-models/forms/attribute-form/attribute-from-view-model.ts +++ b/catalog-ui/src/app/view-models/forms/attribute-form/attribute-from-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {AttributeModel, Component} from "app/models"; import {IMapRegex, ValidationUtils, FormState, PROPERTY_TYPES} from "app/utils"; diff --git a/catalog-ui/src/app/view-models/forms/env-parameters-form/env-parameters-form.ts b/catalog-ui/src/app/view-models/forms/env-parameters-form/env-parameters-form.ts index 476af4ada9..f5962a2f79 100644 --- a/catalog-ui/src/app/view-models/forms/env-parameters-form/env-parameters-form.ts +++ b/catalog-ui/src/app/view-models/forms/env-parameters-form/env-parameters-form.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ValidationUtils} from "app/utils"; import {ArtifactModel, HeatParameterModel, Component} from "app/models"; @@ -96,10 +116,10 @@ export class EnvParametersFormViewModel { this.$scope.isLoading = true; this.artifact.heatParameters = this.$scope.heatParameters; this.artifact.heatParameters.forEach((parameter:any):void => { - /* if ("" === parameter.currentValue) { - parameter.currentValue = null; - }else */ - if (!parameter.currentValue && parameter.defaultValue) { + if ("" === parameter.currentValue) { + //[Bug 154465] - Update and erase current value field in Env parameters form return empty String ("") instead of null. + parameter.currentValue = null; + }else if (!parameter.currentValue && parameter.defaultValue) { parameter.currentValue = parameter.defaultValue; } }); diff --git a/catalog-ui/src/app/view-models/forms/input-form/input-form-view-modal.ts b/catalog-ui/src/app/view-models/forms/input-form/input-form-view-modal.ts index e87e5c6c7d..56542b9694 100644 --- a/catalog-ui/src/app/view-models/forms/input-form/input-form-view-modal.ts +++ b/catalog-ui/src/app/view-models/forms/input-form/input-form-view-modal.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {FormState, PROPERTY_TYPES, ValidationUtils, PROPERTY_VALUE_CONSTRAINTS} from "app/utils"; import {InputModel} from "app/models"; diff --git a/catalog-ui/src/app/view-models/forms/property-forms/base-property-form/property-form-base-model.ts b/catalog-ui/src/app/view-models/forms/property-forms/base-property-form/property-form-base-model.ts index 1ba5a90bb4..726b61eda2 100644 --- a/catalog-ui/src/app/view-models/forms/property-forms/base-property-form/property-form-base-model.ts +++ b/catalog-ui/src/app/view-models/forms/property-forms/base-property-form/property-form-base-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 1/19/2017. */ diff --git a/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view-model.ts b/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view-model.ts index a6124f41a2..8b9acbcab7 100644 --- a/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view-model.ts +++ b/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import { PROPERTY_TYPES, ModalsHandler, ValidationUtils, PROPERTY_VALUE_CONSTRAINTS, FormState, PROPERTY_DATA} from "app/utils"; diff --git a/catalog-ui/src/app/view-models/forms/property-forms/module-property-modal/module-property-model.ts b/catalog-ui/src/app/view-models/forms/property-forms/module-property-modal/module-property-model.ts index a58756b4a6..4c3922264c 100644 --- a/catalog-ui/src/app/view-models/forms/property-forms/module-property-modal/module-property-model.ts +++ b/catalog-ui/src/app/view-models/forms/property-forms/module-property-modal/module-property-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 1/18/2017. */ diff --git a/catalog-ui/src/app/view-models/forms/property-forms/select-datatype-modal/select-datatype-modal-view-model.ts b/catalog-ui/src/app/view-models/forms/property-forms/select-datatype-modal/select-datatype-modal-view-model.ts index 48aa47fdd0..8d5c30a6fe 100644 --- a/catalog-ui/src/app/view-models/forms/property-forms/select-datatype-modal/select-datatype-modal-view-model.ts +++ b/catalog-ui/src/app/view-models/forms/property-forms/select-datatype-modal/select-datatype-modal-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {DataTypesService} from "app/services/data-types-service"; import {PropertyModel, InputPropertyBase, Component} from "app/models"; diff --git a/catalog-ui/src/app/view-models/forms/resource-instance-name-form/resource-instance-name-model.ts b/catalog-ui/src/app/view-models/forms/resource-instance-name-form/resource-instance-name-model.ts index 869e3db584..3f0838cabc 100644 --- a/catalog-ui/src/app/view-models/forms/resource-instance-name-form/resource-instance-name-model.ts +++ b/catalog-ui/src/app/view-models/forms/resource-instance-name-form/resource-instance-name-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ComponentInstanceFactory} from "app/utils"; import {ComponentInstance} from "app/models"; diff --git a/catalog-ui/src/app/view-models/modals/confirmation-modal/confirmation-modal-view-model.ts b/catalog-ui/src/app/view-models/modals/confirmation-modal/confirmation-modal-view-model.ts index 3d8b6c3053..7998d10623 100644 --- a/catalog-ui/src/app/view-models/modals/confirmation-modal/confirmation-modal-view-model.ts +++ b/catalog-ui/src/app/view-models/modals/confirmation-modal/confirmation-modal-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ValidationUtils, ModalType} from "app/utils"; diff --git a/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal-view-model.ts b/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal-view-model.ts index 61a83c88f7..45696568b4 100644 --- a/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal-view-model.ts +++ b/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IConformanceLevelModalModelScope { diff --git a/catalog-ui/src/app/view-models/modals/email-modal/email-modal-view-model.ts b/catalog-ui/src/app/view-models/modals/email-modal/email-modal-view-model.ts index f1fb56d0ff..095d1438b2 100644 --- a/catalog-ui/src/app/view-models/modals/email-modal/email-modal-view-model.ts +++ b/catalog-ui/src/app/view-models/modals/email-modal/email-modal-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IAppConfigurtaion, Component, AsdcComment} from "app/models"; import {ValidationUtils} from "app/utils"; diff --git a/catalog-ui/src/app/view-models/modals/error-modal/error-view-model.ts b/catalog-ui/src/app/view-models/modals/error-modal/error-view-model.ts index f622a6f53b..213bc9f8cd 100644 --- a/catalog-ui/src/app/view-models/modals/error-modal/error-view-model.ts +++ b/catalog-ui/src/app/view-models/modals/error-modal/error-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {CookieService} from "app/services"; diff --git a/catalog-ui/src/app/view-models/modals/message-modal/message-base-modal-model.ts b/catalog-ui/src/app/view-models/modals/message-modal/message-base-modal-model.ts index 3c9e75238a..b987f1088e 100644 --- a/catalog-ui/src/app/view-models/modals/message-modal/message-base-modal-model.ts +++ b/catalog-ui/src/app/view-models/modals/message-modal/message-base-modal-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {SEVERITY} from "app/utils"; diff --git a/catalog-ui/src/app/view-models/modals/message-modal/message-client-modal/client-message-modal-view-model.ts b/catalog-ui/src/app/view-models/modals/message-modal/message-client-modal/client-message-modal-view-model.ts index 053ea41ba3..f2b2217645 100644 --- a/catalog-ui/src/app/view-models/modals/message-modal/message-client-modal/client-message-modal-view-model.ts +++ b/catalog-ui/src/app/view-models/modals/message-modal/message-client-modal/client-message-modal-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IMessageModalModel, MessageModalViewModel, IMessageModalViewModelScope} from "../message-base-modal-model"; diff --git a/catalog-ui/src/app/view-models/modals/message-modal/message-server-modal/server-message-modal-view-model.ts b/catalog-ui/src/app/view-models/modals/message-modal/message-server-modal/server-message-modal-view-model.ts index 5f1d5e7a92..e3c6ad1c55 100644 --- a/catalog-ui/src/app/view-models/modals/message-modal/message-server-modal/server-message-modal-view-model.ts +++ b/catalog-ui/src/app/view-models/modals/message-modal/message-server-modal/server-message-modal-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IMessageModalModel, IMessageModalViewModelScope, MessageModalViewModel} from "../message-base-modal-model"; diff --git a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts index 8e7e79c576..cf8c91c5e3 100644 --- a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts +++ b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ComponentType, CHANGE_COMPONENT_CSAR_VERSION_FLAG, SEVERITY, FileUtils, ModalsHandler, ComponentFactory} from "app/utils"; import {OnboardingService, CacheService} from "app/services"; diff --git a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts index faeaefb5e5..6d4e6d3c68 100644 --- a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts +++ b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IUserProperties} from "app/models"; import {MenuItemGroup, MenuItem} from "app/utils"; diff --git a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor.less b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor.less index 4a16ca2b5b..bc1404d7c4 100644 --- a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor.less +++ b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor.less @@ -163,7 +163,7 @@ padding: 10px 12px; } .w-sdc-dashboard-catalog-header { - .b_9; + .b_3; display: inline-block; font-style: italic; font-weight: bold; @@ -171,28 +171,28 @@ } .w-sdc-dashboard-catalog-header-order { - .b_9; + .b_3; font-weight: 800; } .w-sdc-dashboard-catalog-sort { - .b_9; + .b_3; font-weight: bold; white-space:pre; &:hover{ .hand; text-decoration: none; - .a_9; + .a_3; } &.blue { - .a_9; + .a_3; } } .w-sdc-catalog-sort-arrow{ display: inline-block; &.up{ - .b_9; + .b_3; width: 0; height: 0; border-left: 5px solid transparent; @@ -200,7 +200,7 @@ border-bottom: 5px solid ; } &.down{ - .b_9; + .b_3; width: 0; height: 0; border-left: 5px solid transparent; diff --git a/catalog-ui/src/app/view-models/preloading/preloading-view.ts b/catalog-ui/src/app/view-models/preloading/preloading-view.ts index f299f2a30f..d629d298f2 100644 --- a/catalog-ui/src/app/view-models/preloading/preloading-view.ts +++ b/catalog-ui/src/app/view-models/preloading/preloading-view.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; interface IPreLoadingViewScope { diff --git a/catalog-ui/src/app/view-models/support/support-view-model.ts b/catalog-ui/src/app/view-models/support/support-view-model.ts index 2f43d87b18..5703a74e97 100644 --- a/catalog-ui/src/app/view-models/support/support-view-model.ts +++ b/catalog-ui/src/app/view-models/support/support-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {CacheService} from "app/services"; diff --git a/catalog-ui/src/app/view-models/tabs/hierarchy/hierarchy-view-model.ts b/catalog-ui/src/app/view-models/tabs/hierarchy/hierarchy-view-model.ts index 7c505512c4..961d5b3677 100644 --- a/catalog-ui/src/app/view-models/tabs/hierarchy/hierarchy-view-model.ts +++ b/catalog-ui/src/app/view-models/tabs/hierarchy/hierarchy-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ModalsHandler} from "app/utils"; import {PropertyModel, DisplayModule, Component, ComponentInstance, Tab, Module} from "app/models"; diff --git a/catalog-ui/src/app/view-models/tutorial-end/tutorial-end.ts b/catalog-ui/src/app/view-models/tutorial-end/tutorial-end.ts index 1787cd5937..5c4c4999e8 100644 --- a/catalog-ui/src/app/view-models/tutorial-end/tutorial-end.ts +++ b/catalog-ui/src/app/view-models/tutorial-end/tutorial-end.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; interface ITutorialEndViewModelScope extends ng.IScope { diff --git a/catalog-ui/src/app/view-models/welcome/welcome-view.ts b/catalog-ui/src/app/view-models/welcome/welcome-view.ts index 154a70c301..a29a539a3c 100644 --- a/catalog-ui/src/app/view-models/welcome/welcome-view.ts +++ b/catalog-ui/src/app/view-models/welcome/welcome-view.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; export interface IWelcomeViewMode { diff --git a/catalog-ui/src/app/view-models/workspace/tabs/activity-log/activity-log.ts b/catalog-ui/src/app/view-models/workspace/tabs/activity-log/activity-log.ts index f41364dbfd..f4ce1d8bc4 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/activity-log/activity-log.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/activity-log/activity-log.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IWorkspaceViewModelScope} from "app/view-models/workspace/workspace-view-model"; import {Activity} from "app/models"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/attributes/attributes-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/attributes/attributes-view-model.ts index d8a60444be..ce7296cf04 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/attributes/attributes-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/attributes/attributes-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IWorkspaceViewModelScope} from "app/view-models/workspace/workspace-view-model"; import {Component, AttributeModel} from "app/models"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view-model.ts index d0eefdfd11..894f8aeb2a 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view-model.ts @@ -7,9 +7,9 @@ * 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. @@ -134,6 +134,8 @@ export class CompositionViewModel { private removeSelectedComponentInstance = ():void => { this.eventListenerService.notifyObservers(GRAPH_EVENTS.ON_DELETE_MULTIPLE_COMPONENTS); + this.$scope.currentComponent.selectedInstance = null; + this.$scope.selectedComponent = this.$scope.currentComponent; }; private updateUuidMap = ():void => { @@ -241,10 +243,7 @@ export class CompositionViewModel { this.$scope.setComponent(this.$scope.currentComponent); this.$scope.updateSelectedComponent(); }; - - this.$scope.reload = (component:Component):void => { - this.$state.go(this.$state.current.name,{id:component.uniqueId},{reload:true}); - }; + this.eventListenerService.registerObserverCallback(EVENTS.ON_CHECKOUT, this.$scope.reload); diff --git a/catalog-ui/src/app/view-models/workspace/tabs/composition/composition.less b/catalog-ui/src/app/view-models/workspace/tabs/composition/composition.less index 501805be3f..7a775bdb11 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/composition/composition.less +++ b/catalog-ui/src/app/view-models/workspace/tabs/composition/composition.less @@ -242,6 +242,10 @@ white-space: nowrap; } + .w-sdc-designer-sidebar-section-title { + text-transform: uppercase; + } + .w-sdc-designer-sidebar-section-title + .w-sdc-designer-sidebar-section-content { margin: 0 auto; } @@ -253,6 +257,8 @@ .i-sdc-designer-sidebar-section-content-item { .b_7; + font-size: 13px; + margin-bottom: 5px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -668,11 +674,10 @@ } .i-sdc-designer-leftbar-section-content-item-info-title { - .m_14_m; + .m_13_m; line-height: 14px; overflow: hidden; text-overflow: ellipsis; - text-transform: uppercase; max-width: 120px; display: inline-block; white-space: nowrap; @@ -680,12 +685,11 @@ } .i-sdc-designer-leftbar-section-content-item-info-text { - .p_3; + .m_13_r; line-height: 15px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - //margin: -1px 0 2px 0; } .i-sdc-designer-leftbar-section-content-item-info-text-link { diff --git a/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts index f12e95c9df..83e4653954 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import { ArtifactModel, @@ -28,7 +48,7 @@ export interface IArtifactsViewModelScope extends ICompositionViewModelScope { getEnvArtifact(heatArtifact:ArtifactModel):any; getEnvArtifactName(artifact:ArtifactModel):string; isLicenseArtifact(artifact:ArtifactModel):boolean; - isVFiArtifact(artifact:ArtifactModel):boolean; + //isVFiArtifact(artifact:ArtifactModel):boolean; } export class ResourceArtifactsViewModel { @@ -105,6 +125,7 @@ export class ResourceArtifactsViewModel { } } this.$scope.artifacts = artifacts; + this.$scope.isLoading = false; }; @@ -217,12 +238,13 @@ export class ResourceArtifactsViewModel { return this.artifactsUtils.getTitle(this.$scope.artifactType, this.$scope.currentComponent); }; - this.$scope.isVFiArtifact = (artifact:ArtifactModel):boolean=> { - if (artifact.artifactGroupType === ArtifactGroupType.INFORMATION) {//fix DE256847 - return this.$scope.currentComponent.artifacts && (!this.$scope.currentComponent.artifacts[artifact.artifactLabel] || !this.$scope.currentComponent.artifacts[artifact.artifactLabel].artifactName); - } - return this.$scope.currentComponent.selectedInstance && this.$scope.currentComponent.selectedInstance.deploymentArtifacts && this.$scope.currentComponent.selectedInstance.deploymentArtifacts[artifact.artifactLabel]; - }; + // Bug 310499 - user should be unable to delete RI artifact. (also talked to David and agreed this function isn't necessary) + // this.$scope.isVFiArtifact = (artifact:ArtifactModel):boolean=> { + // if (artifact.artifactGroupType === ArtifactGroupType.INFORMATION) {//fix DE256847 + // return this.$scope.currentComponent.artifacts && (!this.$scope.currentComponent.artifacts[artifact.artifactLabel] || !this.$scope.currentComponent.artifacts[artifact.artifactLabel].artifactName); + // } + // return this.$scope.currentComponent.selectedInstance && this.$scope.currentComponent.selectedInstance.deploymentArtifacts && this.$scope.currentComponent.selectedInstance.deploymentArtifacts[artifact.artifactLabel]; + // }; this.$scope.addOrUpdate = (artifact:ArtifactModel):void => { this.artifactsUtils.setArtifactType(artifact, this.$scope.artifactType); diff --git a/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view.html b/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view.html index bd4864771e..01cb9d4ee4 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view.html +++ b/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view.html @@ -10,7 +10,7 @@
@@ -19,8 +19,8 @@ data-ng-if="artifact.artifactName">
@@ -36,7 +36,7 @@ Description:{{artifact.description}}
-
diff --git a/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts.less b/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts.less index dd3b16447c..3596a217b8 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts.less +++ b/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts.less @@ -160,7 +160,7 @@ } .i-sdc-env-form-label{ - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; color: @main_color_m; overflow: hidden; max-width: 450px; @@ -178,8 +178,13 @@ } } +.table-container-flex .table .body .scrollbar-container { + overflow-x:auto !important; //need to override the overflow-hidden for the table so that the popover auto positioning works + min-height: 400px; +} + .parameter-description-popover.deployment-artifact-view { - margin-left: -10px; + margin-left: -22px; z-index: 1040; min-width: 300px; .input-error { diff --git a/catalog-ui/src/app/view-models/workspace/tabs/deployment/deployment-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/deployment/deployment-view-model.ts index c94342a51e..76be6c1141 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/deployment/deployment-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/deployment/deployment-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IWorkspaceViewModelScope} from "app/view-models/workspace/workspace-view-model"; import {ComponentFactory, MenuHandler, ChangeLifecycleStateHandler, ModalsHandler} from "app/utils"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/distribution/disribution-status-modal/disribution-status-modal-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/distribution/disribution-status-modal/disribution-status-modal-view-model.ts index ce2e0169bf..5ffae64689 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/distribution/disribution-status-modal/disribution-status-modal-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/distribution/disribution-status-modal/disribution-status-modal-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {Distribution, DistributionComponent, ExportExcel} from "app/models"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/distribution/distribution-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/distribution/distribution-view-model.ts index 002b16f63f..1852b6a83e 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/distribution/distribution-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/distribution/distribution-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {Distribution, DistributionComponent, Service} from "app/models"; import {ModalsHandler, Dictionary} from "app/utils"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts index 44953985fc..05b3324bbb 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ModalsHandler, ValidationUtils, EVENTS, CHANGE_COMPONENT_CSAR_VERSION_FLAG, ComponentType, DEFAULT_ICON, ResourceType} from "app/utils"; @@ -345,5 +365,6 @@ export class GeneralViewModel { this.$scope.component.icon = DEFAULT_ICON; } }; + this.EventListenerService.registerObserverCallback(EVENTS.ON_CHECKOUT, this.$scope.reload); }; } diff --git a/catalog-ui/src/app/view-models/workspace/tabs/general/general.less b/catalog-ui/src/app/view-models/workspace/tabs/general/general.less index 1861d02e98..caa755cce3 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/general/general.less +++ b/catalog-ui/src/app/view-models/workspace/tabs/general/general.less @@ -45,6 +45,10 @@ } } + .i-sdc-form-label { + font-size: 12px; + } + .template-desc { border: 1px dashed @border_color_f; height: 130px; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/icons/icons-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/icons/icons-view-model.ts index 03dad2cc06..c25bc4a1f1 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/icons/icons-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/icons/icons-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 4/4/2016. */ diff --git a/catalog-ui/src/app/view-models/workspace/tabs/information-artifacts/information-artifacts-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/information-artifacts/information-artifacts-view-model.ts index e10a9944d3..ceaba3c187 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/information-artifacts/information-artifacts-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/information-artifacts/information-artifacts-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ModalsHandler} from "app/utils"; import {SharingService} from "app/services"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/inputs/resource-input/resource-inputs-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/inputs/resource-input/resource-inputs-view-model.ts index 49fedd6e21..78865ac873 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/inputs/resource-input/resource-inputs-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/inputs/resource-input/resource-inputs-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IWorkspaceViewModelScope} from "app/view-models/workspace/workspace-view-model"; import {ComponentInstance, InstancesInputsOrPropertiesMapData, Resource, PropertyModel, InputModel} from "app/models"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/inputs/service-input/service-inputs-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/inputs/service-input/service-inputs-view-model.ts index f3b2de0943..013a0023f9 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/inputs/service-input/service-inputs-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/inputs/service-input/service-inputs-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IWorkspaceViewModelScope} from "app/view-models/workspace/workspace-view-model"; import {ComponentInstance, InstancesInputsOrPropertiesMapData, Service, IAppMenu, InputModel, PropertyModel, InputPropertyBase} from "app/models"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/management-workflow/management-workflow-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/management-workflow/management-workflow-view-model.ts index b7428e990b..f8b29c4a9c 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/management-workflow/management-workflow-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/management-workflow/management-workflow-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ArtifactType} from "app/utils"; import {ArtifactGroupModel} from "app/models"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/network-call-flow/network-call-flow-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/network-call-flow/network-call-flow-view-model.ts index 511c17eb60..6c7666d28c 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/network-call-flow/network-call-flow-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/network-call-flow/network-call-flow-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IWorkspaceViewModelScope} from "app/view-models/workspace/workspace-view-model"; import {VendorModel} from "app/view-models/workspace/tabs/management-workflow/management-workflow-view-model"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/product-hierarchy/product-hierarchy-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/product-hierarchy/product-hierarchy-view-model.ts index 233b12952b..c891875f52 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/product-hierarchy/product-hierarchy-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/product-hierarchy/product-hierarchy-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ComponentFactory} from "app/utils"; import {Product, IGroup, ISubCategory, IMainCategory} from "app/models"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/properties/properties-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/properties/properties-view-model.ts index 923cc58a7e..c9f2d0725f 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/properties/properties-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/properties/properties-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {IWorkspaceViewModelScope} from "app/view-models/workspace/workspace-view-model"; import {PropertyModel} from "app/models"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/req-and-capabilities/req-and-capabilities-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/req-and-capabilities/req-and-capabilities-view-model.ts index 4ac99edf8a..c02900a413 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/req-and-capabilities/req-and-capabilities-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/req-and-capabilities/req-and-capabilities-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by rcohen on 9/22/2016. */ diff --git a/catalog-ui/src/app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view-model.ts index 06022786ee..5f724c48fd 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + 'use strict'; import {ArtifactModel, IFileDownload} from "app/models"; import {IWorkspaceViewModelScope} from "app/view-models/workspace/workspace-view-model"; diff --git a/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts b/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts index 4300c33412..21bd199aac 100644 --- a/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 3/30/2016. */ @@ -71,6 +91,7 @@ export interface IWorkspaceViewModelScope extends ng.IScope { updateSelectedMenuItem():void; uploadFileChangedInGeneralTab():void; updateMenuComponentName(ComponentName:string):void; + reload(component:Component):void; } export class WorkspaceViewModel { @@ -238,7 +259,9 @@ export class WorkspaceViewModel { this.$scope.onVersionChanged = (selectedId:string):void => { if (this.$state.current.data && this.$state.current.data.unsavedChanges) { - this.$scope.changeVersion.selectedVersion = _.find(this.$scope.versionsList, {versionId: this.$scope.component.uniqueId}); + this.$scope.changeVersion.selectedVersion = _.find(this.$scope.versionsList, (versionObj)=> { + return versionObj.versionId === this.$scope.component.uniqueId; + }); } this.$scope.isLoading = true; this.$state.go(this.$state.current.name, { @@ -619,6 +642,11 @@ export class WorkspaceViewModel { this.$scope.isDeployment = (newVal.indexOf(States.WORKSPACE_DEPLOYMENT) > -1); } }); + + this.$scope.reload = (component:Component):void => { + this.$state.go(this.$state.current.name,{id:component.uniqueId},{reload:true}); + }; + }; private initAfterScope = ():void => { diff --git a/catalog-ui/src/app/view-models/workspace/workspace.less b/catalog-ui/src/app/view-models/workspace/workspace.less index 6cf024e335..278708ca33 100644 --- a/catalog-ui/src/app/view-models/workspace/workspace.less +++ b/catalog-ui/src/app/view-models/workspace/workspace.less @@ -1,3 +1,5 @@ +@import '../../../assets/styles/variables.less'; + .sdc-workspace-container { .bg_p; @@ -103,8 +105,9 @@ margin: 2px 0 7px 10px; border-left: 1px solid @main_color_o; line-height: 15px; - font-family: @font-omnes-medium; + font-family: @font-opensans-bold; color: @main_color_m; + font-size:12px; .lifecycle-state-icon { .sprite-new; @@ -147,4 +150,4 @@ .properties-assignment .sdc-workspace-container .w-sdc-main-right-container .w-sdc-main-container-body-content{ padding: 80px 2% 40px 2%; -} \ No newline at end of file +} diff --git a/catalog-ui/src/assets/styles/fonts.less b/catalog-ui/src/assets/styles/fonts.less index 752f41f86a..fad2838a03 100644 --- a/catalog-ui/src/assets/styles/fonts.less +++ b/catalog-ui/src/assets/styles/fonts.less @@ -1,72 +1,60 @@ -//Omnes_ATT W02 Italic +// OpenSans Bold @font-face { - font-family: omnes-italic; - src: url('fonts/OmnesATT/Omnes_ATTW02Italic.eot'); - src: url('fonts/OmnesATT/Omnes_ATTW02Italic.eot?#iefix') format('embedded-opentype'), - url('fonts/OmnesATT/Omnes_ATTW02Italic.ttf'); + font-family: OpenSans-Bold; + src: url("fonts/OpenSans/OpenSans-Bold.ttf") format('truetype'); } -//Omnes_ATT W02 Light +// OpenSans Bold Italic @font-face { - font-family: omnes-light; - src: url('fonts/OmnesATT/Omnes_ATTW02Light.eot'); - src: url('fonts/OmnesATT/Omnes_ATTW02Light.eot?#iefix') format('embedded-opentype'), - url('fonts/OmnesATT/Omnes_ATTW02Light.ttf'); + font-family: OpenSans-BoldItlaic; + src: url("fonts/OpenSans/OpenSans-BoldItalic.ttf") format('truetype'); } -//Omnes_ATT W02 Light Italic +// OpenSans Extra Bold @font-face { - font-family: omnes-light-italic; - src: url('fonts/OmnesATT/Omnes_ATTW02LightItalic.eot'); - src: url('fonts/OmnesATT/Omnes_ATTW02LightItalic.eot?#iefix') format('embedded-opentype'), - url('fonts/OmnesATT/Omnes_ATTW02LightItalic.ttf'); + font-family: OpenSans-ExtraBold; + src: url("fonts/OpenSans/OpenSans-ExtraBold.ttf") format('truetype'); } -//Omnes_ATT W02 Medium +// OpenSans Extra Bold Italic @font-face { - font-family: omnes-medium; - src: url('fonts/OmnesATT/Omnes_ATTW02Medium.eot'); - src: url('fonts/OmnesATT/Omnes_ATTW02Medium.eot?#iefix') format('embedded-opentype'), - url('fonts/OmnesATT/Omnes_ATTW02Medium.ttf'); + font-family: OpenSans-ExtraBoldItalic; + src: url("fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf") format('truetype'); } -//Omnes_ATT W02 Medium Italic +// OpenSans Italic @font-face { - font-family: omnes-medium-italic; - src: url('fonts/OmnesATT/Omnes_ATTW02MediumItalic.eot'); - src: url('fonts/OmnesATT/Omnes_ATTW02MediumItalic.eot?#iefix') format('embedded-opentype'), - url('fonts/OmnesATT/Omnes_ATTW02MediumItalic.ttf'); + font-family: OpenSans-Italic; + src: url("fonts/OpenSans/OpenSans-Italic.ttf") format('truetype'); } -//Omnes_ATT W02 Regular +// OpenSans Light @font-face { - font-family: omnes-regular; - src: url('fonts/OmnesATT/Omnes_ATTW02.eot'); - src: url('fonts/OmnesATT/Omnes_ATTW02.eot?#iefix') format('embedded-opentype'), - url('fonts/OmnesATT/Omnes_ATTW02.ttf'); + font-family: OpenSans-Light; + src: url("fonts/OpenSans/OpenSans-Light.ttf") format('truetype'); } -//Omnes_ATT W02 Bold +// OpenSans Light Italic @font-face { - font-family: omnes-bold; - src: url('fonts/OmnesATT/Omnes_ATTW02Bold.eot'); - src: url('fonts/OmnesATT/Omnes_ATTW02Bold.eot?#iefix') format('embedded-opentype'), - url('fonts/OmnesATT/Omnes_ATTW02Bold.ttf'); + font-family: OpenSans-LightItalic; + src: url("fonts/OpenSans/OpenSans-LightItalic.ttf") format('truetype'); } -//Omnes_ATT W02 Bold Italic +// OpenSans Regular @font-face { - font-family: omnes-bold-italic; - src: url('fonts/OmnesATT/OmnesATTW02BoldItalic.eot'); - src: url('fonts/OmnesATT/OmnesATTW02BoldItalic.eot?#iefix') format('embedded-opentype'), - url('fonts/OmnesATT/OmnesATTW02BoldItalic.ttf'); + font-family: OpenSans-Regular; + src: url("fonts/OpenSans/OpenSans-Regular.ttf") format('truetype'); } +// OpenSans Semi Bold +@font-face { + font-family: OpenSans-Semibold; + src: url("fonts/OpenSans/OpenSans-Semibold.ttf") format('truetype'); +} -//ClearviewATT Book +// OpenSans Semi Bold Italic @font-face { - font-family: clearview-book; - src: url('fonts/ClearviewATT/ClearviewATT-Bk.eot'); - src: url('fonts/ClearviewATT/ClearviewATT-Bk.eot?#iefix') format('embedded-opentype'), - url('fonts/ClearviewATT/ClearviewATT-Bk.ttf'); + font-family: OpenSans-SemiboldItalic; + src: url("fonts/OpenSans/OpenSans-SemiboldItalic.ttf") format('truetype'); } + diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bd.eot b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bd.eot deleted file mode 100644 index 83074fbe2b..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bd.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bd.svg b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bd.svg deleted file mode 100644 index 564f750d99..0000000000 --- a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bd.svg +++ /dev/null @@ -1,424 +0,0 @@ - - - - -1.0 -ClearviewATT Bd -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Copyright (c) Terminal Design, Inc, 2005. All rights reserved. -Clearview is a trademark of Terminal Design, Inc. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bd.ttf b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bd.ttf deleted file mode 100644 index 7bfb9d5cc2..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bd.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bd.woff b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bd.woff deleted file mode 100644 index b1f00eeac9..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bd.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BdIt.eot b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BdIt.eot deleted file mode 100644 index 22646213e6..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BdIt.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BdIt.svg b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BdIt.svg deleted file mode 100644 index 0996bb5eec..0000000000 --- a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BdIt.svg +++ /dev/null @@ -1,425 +0,0 @@ - - - - -1.0 -ClearviewATT BdIt -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Copyright (c) Terminal Design, Inc, 2005. All rights reserved. -Clearview is a trademark of Terminal Design, Inc. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BdIt.ttf b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BdIt.ttf deleted file mode 100644 index 69b3c834e6..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BdIt.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BdIt.woff b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BdIt.woff deleted file mode 100644 index f2850a6f53..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BdIt.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bk.eot b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bk.eot deleted file mode 100644 index a945fb3592..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bk.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bk.svg b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bk.svg deleted file mode 100644 index 279204943f..0000000000 --- a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bk.svg +++ /dev/null @@ -1,425 +0,0 @@ - - - - -1.0 -ClearviewATT Bk -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Copyright (c) Terminal Design, Inc, 2005. All rights reserved. -Clearview is a trademark of Terminal Design, Inc. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bk.ttf b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bk.ttf deleted file mode 100644 index b4390461c6..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bk.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bk.woff b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bk.woff deleted file mode 100644 index 5373567803..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Bk.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BkIt.eot b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BkIt.eot deleted file mode 100644 index 4ab6695752..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BkIt.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BkIt.svg b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BkIt.svg deleted file mode 100644 index c2337a7f89..0000000000 --- a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BkIt.svg +++ /dev/null @@ -1,425 +0,0 @@ - - - - -1.0 -ClearviewATT BkIt -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Copyright (c) Terminal Design, Inc, 2005. All rights reserved. -Clearview is a trademark of Terminal Design, Inc. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BkIt.ttf b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BkIt.ttf deleted file mode 100644 index 7e7aa05778..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BkIt.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BkIt.woff b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BkIt.woff deleted file mode 100644 index 55fbfd6896..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-BkIt.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Lt.eot b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Lt.eot deleted file mode 100644 index 06a4bf9949..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Lt.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Lt.svg b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Lt.svg deleted file mode 100644 index 40656e14f8..0000000000 --- a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Lt.svg +++ /dev/null @@ -1,425 +0,0 @@ - - - - -1.0 -ClearviewATT Lt -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Copyright (c) Terminal Design, Inc, 2005. All rights reserved. -Clearview is a trademark of Terminal Design, Inc. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Lt.ttf b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Lt.ttf deleted file mode 100644 index c9a45c0e51..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Lt.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Lt.woff b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Lt.woff deleted file mode 100644 index 521ee2e918..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-Lt.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-LtIt.eot b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-LtIt.eot deleted file mode 100644 index 06772919e7..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-LtIt.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-LtIt.svg b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-LtIt.svg deleted file mode 100644 index bff63e5524..0000000000 --- a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-LtIt.svg +++ /dev/null @@ -1,424 +0,0 @@ - - - - -1.0 -ClearviewATT LtIt -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Copyright (c) Terminal Design, Inc, 2005. All rights reserved. -Clearview is a trademark of Terminal Design, Inc. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-LtIt.ttf b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-LtIt.ttf deleted file mode 100644 index bd7ac47137..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-LtIt.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-LtIt.woff b/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-LtIt.woff deleted file mode 100644 index 7f8a274165..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/ClearviewATT/ClearviewATT-LtIt.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/AT&T Variation ID.tab b/catalog-ui/src/assets/styles/fonts/OmnesATT/AT&T Variation ID.tab deleted file mode 100644 index e0085fd9ac..0000000000 --- a/catalog-ui/src/assets/styles/fonts/OmnesATT/AT&T Variation ID.tab +++ /dev/null @@ -1,9 +0,0 @@ - Variation ID tier -602 24875 1243116 Omnes_ATT W02 Italic 1243117 38 CUS24875W02 -602 24872 1243119 Omnes_ATT W02 Light 1243120 38 CUS24872W02 -602 24873 1243122 Omnes_ATT W02 Light Italic 1243123 38 CUS24873W02 -602 24876 1243125 Omnes_ATT W02 Medium 1243126 38 CUS24876W02 -602 24877 1243128 Omnes_ATT W02 Medium Italic 1243129 38 CUS24877W02 -602 24874 1243131 Omnes_ATT W02 Regular 1243132 38 CUS24874W02 -602 26730 1418220 Omnes_ATT W02 Bold 1418221 38 CUS26730W02 -602 26731 1418223 Omnes_ATT W02 Bold Italic 1418224 38 CUS26731W02 diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/OmnesATTW02BoldItalic.eot b/catalog-ui/src/assets/styles/fonts/OmnesATT/OmnesATTW02BoldItalic.eot deleted file mode 100644 index da1c1d1ebe..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/OmnesATTW02BoldItalic.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/OmnesATTW02BoldItalic.svg b/catalog-ui/src/assets/styles/fonts/OmnesATT/OmnesATTW02BoldItalic.svg deleted file mode 100644 index 916075aa05..0000000000 --- a/catalog-ui/src/assets/styles/fonts/OmnesATT/OmnesATTW02BoldItalic.svg +++ /dev/null @@ -1,3671 +0,0 @@ - - - - -1.0 -Omnes_ATT W02 Bold Italic -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Generated in 2010 by FontLab Studio. Copyright info pending. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/OmnesATTW02BoldItalic.ttf b/catalog-ui/src/assets/styles/fonts/OmnesATT/OmnesATTW02BoldItalic.ttf deleted file mode 100644 index 4f35e1f9b8..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/OmnesATTW02BoldItalic.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/OmnesATTW02BoldItalic.woff b/catalog-ui/src/assets/styles/fonts/OmnesATT/OmnesATTW02BoldItalic.woff deleted file mode 100644 index 1722dce99e..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/OmnesATTW02BoldItalic.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02.eot b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02.eot deleted file mode 100644 index 39e1eae7c7..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02.svg b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02.svg deleted file mode 100644 index 73923de097..0000000000 --- a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02.svg +++ /dev/null @@ -1,3694 +0,0 @@ - - - - -1.0 -Omnes_ATT W02 -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Generated by RoboFog - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02.ttf b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02.ttf deleted file mode 100644 index 2342be4be5..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02.woff b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02.woff deleted file mode 100644 index 0acf1f027f..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Bold.eot b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Bold.eot deleted file mode 100644 index 0e5892d1e0..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Bold.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Bold.svg b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Bold.svg deleted file mode 100644 index 9670981b29..0000000000 --- a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Bold.svg +++ /dev/null @@ -1,4365 +0,0 @@ - - - - -1.0 -Omnes_ATT W02 Bold -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Generated in 2010 by FontLab Studio. Copyright info pending. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Bold.ttf b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Bold.ttf deleted file mode 100644 index 94934087bb..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Bold.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Bold.woff b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Bold.woff deleted file mode 100644 index 1dfd28f299..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Bold.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Italic.eot b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Italic.eot deleted file mode 100644 index 8723e66fa0..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Italic.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Italic.svg b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Italic.svg deleted file mode 100644 index dbf33a9768..0000000000 --- a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Italic.svg +++ /dev/null @@ -1,3799 +0,0 @@ - - - - -1.0 -Omnes_ATT W02 Italic -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Generated by RoboFog - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Italic.ttf b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Italic.ttf deleted file mode 100644 index 4ef76763bd..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Italic.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Italic.woff b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Italic.woff deleted file mode 100644 index 750d90d387..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Italic.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Light.eot b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Light.eot deleted file mode 100644 index 280d111fe4..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Light.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Light.svg b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Light.svg deleted file mode 100644 index 85f39f5008..0000000000 --- a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Light.svg +++ /dev/null @@ -1,3872 +0,0 @@ - - - - -1.0 -Omnes_ATT W02 Light -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Generated in 2010 by FontLab Studio. Copyright info pending. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Light.ttf b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Light.ttf deleted file mode 100644 index 273761ab3d..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Light.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Light.woff b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Light.woff deleted file mode 100644 index b12120a86e..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Light.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02LightItalic.eot b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02LightItalic.eot deleted file mode 100644 index 2da6a99ec6..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02LightItalic.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02LightItalic.svg b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02LightItalic.svg deleted file mode 100644 index ab6936ceeb..0000000000 --- a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02LightItalic.svg +++ /dev/null @@ -1,3030 +0,0 @@ - - - - -1.0 -Omnes_ATT W02 Light Italic -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Generated in 2010 by FontLab Studio. Copyright info pending. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02LightItalic.ttf b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02LightItalic.ttf deleted file mode 100644 index 5153cee682..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02LightItalic.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02LightItalic.woff b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02LightItalic.woff deleted file mode 100644 index cf9993a1d6..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02LightItalic.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Medium.eot b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Medium.eot deleted file mode 100644 index 37c715f5be..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Medium.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Medium.svg b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Medium.svg deleted file mode 100644 index ad72d0be51..0000000000 --- a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Medium.svg +++ /dev/null @@ -1,2473 +0,0 @@ - - - - -1.0 -Omnes_ATT W02 Medium -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Generated in 2010 by FontLab Studio. Copyright info pending. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Medium.ttf b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Medium.ttf deleted file mode 100644 index 2740425412..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Medium.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Medium.woff b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Medium.woff deleted file mode 100644 index 5cff69add1..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02Medium.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02MediumItalic.eot b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02MediumItalic.eot deleted file mode 100644 index 84ba4acc6b..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02MediumItalic.eot and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02MediumItalic.svg b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02MediumItalic.svg deleted file mode 100644 index eca8f73836..0000000000 --- a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02MediumItalic.svg +++ /dev/null @@ -1,3837 +0,0 @@ - - - - -1.0 -Omnes_ATT W02 Medium Italic -Monotype Imaging Inc. - -Fonts.com WebFonts -http://webfonts.fonts.com -Home of the Web fonts - - -http://webfonts.fonts.com/Legal - -Generated in 2010 by FontLab Studio. Copyright info pending. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz AÁÀÂÄÅÃÆ CÇ DÐ EÉÈÊË I Í Ì Î Ï NÑ -OÓÒÔÖÕØŒ SŠ UÚÙÛÜ YÝŸ ZŽ Þ aáàâäåãæ cç dð eéèêë i ı í ì î ï nñ oóòôöõøœ sšß uúùûü yýÿ zž -þ 1234567890 ½ ¼ ¾ % ‰ $¢£¥ƒ€¤ † ‡ § ¶ # ^~µ +×± < = > ÷¬ !¡?¿ " & ' * ° . , : ; () [ \ ] {} / | -¦ _ ‚ „ … ‹› «» ‘ ’ “ ” • ­ - – — @ © ® ™ ªº ¹²³ ´ ` ˆ ˜ ¨ ¯ · ¸ - diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02MediumItalic.ttf b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02MediumItalic.ttf deleted file mode 100644 index 46bfd531b0..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02MediumItalic.ttf and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02MediumItalic.woff b/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02MediumItalic.woff deleted file mode 100644 index 20419ed3b3..0000000000 Binary files a/catalog-ui/src/assets/styles/fonts/OmnesATT/Omnes_ATTW02MediumItalic.woff and /dev/null differ diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/demo-async.htm b/catalog-ui/src/assets/styles/fonts/OmnesATT/demo-async.htm deleted file mode 100644 index f7a43e6a34..0000000000 --- a/catalog-ui/src/assets/styles/fonts/OmnesATT/demo-async.htm +++ /dev/null @@ -1,169 +0,0 @@ - - - - Webfonts Demo - - - - - - -
-

Fonts.com Web fonts

-

@font-face implementation instructions

-

The asynchronous script loads in the background allowing the other elements of your website to load first and undeterred.

-
-

The fonts contained in this kit are:

-
-
Omnes_ATT W02 Italic
-
Omnes_ATT W02 Light
-
Omnes_ATT W02 Light Italic
-
Omnes_ATT W02 Medium
-
Omnes_ATT W02 Medium Italic
-
Omnes_ATT W02 Regular
-
Omnes_ATT W02 Bold
-
Omnes_ATT W02 Bold Italic
- -
-
- Click here for css only web fonts implementation -
-
-

CSS Implementation Guidelines

-

You and any third party web font hosting service are responsible for ensuring that the font software in the self-hosting kit, in its original format, can only be used on the Web Sites for which the self-hosting kit was downloaded and cannot be used or referenced by any other web site. This includes, but is not limited to installing adequate technical protection measures that restrict the use and/or access to the font software, for instance by utilizing JavaScript or access control mechanism for cross-origin resource sharing and protecting against use on web sites other than the Web Sites for which the self-hosting kit was downloaded by restricting domain access only to such Web Sites. You must also retain the pageview tracking code on any Web Site that you self-host. In the event this Agreement terminates for any reason, the font software included with the self-hosting kit must be deleted from the server and all copies must be destroyed or returned to Monotype Imaging.

-

View "WEB FONT SOFTWARE" LICENSE AGREEMENT

-

Asynchronous Implementation (Requires JavaScript)

-

Font file names have been obfuscated to protect the font software. You can identify font format based on file ending:

-
    -
  • 1 - TrueType (ttf)
    • -
  • 2 - Embedded OpenType (eot)
    • -
  • 3 - Web Open Font Format (woff)
    • -
  • 4 - Scalable Vector Graphics (svg)
    • -
-

Copy and paste following code in head section of the page

-
- -

Licensing information should be included within the CSS

-
/*
-This CSS resource incorporates links to font software which is the valuable copyrighted
-property of Monotype Imaging and/or its suppliers. You may not attempt to copy, install,
-redistribute, convert, modify or reverse engineer this font software. Please contact Monotype
-Imaging with any questions regarding Web Fonts:  http://webfonts.fonts.com
-*/
-
-
- - diff --git a/catalog-ui/src/assets/styles/fonts/OmnesATT/demo.htm b/catalog-ui/src/assets/styles/fonts/OmnesATT/demo.htm deleted file mode 100644 index edb62ad34a..0000000000 --- a/catalog-ui/src/assets/styles/fonts/OmnesATT/demo.htm +++ /dev/null @@ -1,155 +0,0 @@ - - - - Webfonts Demo - - - - - -
-

Fonts.com Web fonts

-

@font-face implementation instructions

-
-

The fonts contained in this kit are:

-
-
Omnes_ATT W02 Italic
-
Omnes_ATT W02 Light
-
Omnes_ATT W02 Light Italic
-
Omnes_ATT W02 Medium
-
Omnes_ATT W02 Medium Italic
-
Omnes_ATT W02 Regular
-
Omnes_ATT W02 Bold
-
Omnes_ATT W02 Bold Italic
- -
-
- Click here for asynchronous web fonts implementation -
-
-

CSS Implementation Guidelines

-

You and any third party web font hosting service are responsible for ensuring that the font software in the self-hosting kit, in its original format, can only be used on the Web Sites for which the self-hosting kit was downloaded and cannot be used or referenced by any other web site. This includes, but is not limited to installing adequate technical protection measures that restrict the use and/or access to the font software, for instance by utilizing JavaScript or access control mechanism for cross-origin resource sharing and protecting against use on web sites other than the Web Sites for which the self-hosting kit was downloaded by restricting domain access only to such Web Sites. You must also retain the pageview tracking code on any Web Site that you self-host. In the event this Agreement terminates for any reason, the font software included with the self-hosting kit must be deleted from the server and all copies must be destroyed or returned to Monotype Imaging.

-

View "WEB FONT SOFTWARE" LICENSE AGREEMENT

-

Font file names have been obfuscated to protect the font software. You can identify font format based on file ending:

-
    -
  • 1 - TrueType (ttf)
    • -
  • 2 - Embedded OpenType (eot)
    • -
  • 3 - Web Open Font Format (woff)
    • -
  • 4 - Scalable Vector Graphics (svg)
    • -
-

Copy and paste following code in head section of the page

-
- -

Licensing information should be included within the CSS

-
/*
-This CSS resource incorporates links to font software which is the valuable copyrighted
-property of Monotype Imaging and/or its suppliers. You may not attempt to copy, install,
-redistribute, convert, modify or reverse engineer this font software. Please contact Monotype
-Imaging with any questions regarding Web Fonts:  http://webfonts.fonts.com
-*/
-
-
- - diff --git a/catalog-ui/src/assets/styles/fonts/OpenSans/Apache License.txt b/catalog-ui/src/assets/styles/fonts/OpenSans/Apache License.txt new file mode 100644 index 0000000000..989e2c59e9 --- /dev/null +++ b/catalog-ui/src/assets/styles/fonts/OpenSans/Apache License.txt @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. \ No newline at end of file diff --git a/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Bold.ttf b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Bold.ttf new file mode 100644 index 0000000000..fd79d43bea Binary files /dev/null and b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Bold.ttf differ diff --git a/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-BoldItalic.ttf b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-BoldItalic.ttf new file mode 100644 index 0000000000..9bc800958a Binary files /dev/null and b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-BoldItalic.ttf differ diff --git a/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-ExtraBold.ttf b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-ExtraBold.ttf new file mode 100644 index 0000000000..21f6f84a07 Binary files /dev/null and b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-ExtraBold.ttf differ diff --git a/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf new file mode 100644 index 0000000000..31cb688340 Binary files /dev/null and b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf differ diff --git a/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Italic.ttf b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Italic.ttf new file mode 100644 index 0000000000..c90da48ff3 Binary files /dev/null and b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Italic.ttf differ diff --git a/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Light.ttf b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Light.ttf new file mode 100644 index 0000000000..0d381897da Binary files /dev/null and b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Light.ttf differ diff --git a/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-LightItalic.ttf b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-LightItalic.ttf new file mode 100644 index 0000000000..68299c4bc6 Binary files /dev/null and b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-LightItalic.ttf differ diff --git a/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Regular.ttf b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Regular.ttf new file mode 100644 index 0000000000..db433349b7 Binary files /dev/null and b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Regular.ttf differ diff --git a/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Semibold.ttf b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Semibold.ttf new file mode 100644 index 0000000000..1a7679e394 Binary files /dev/null and b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-Semibold.ttf differ diff --git a/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-SemiboldItalic.ttf b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-SemiboldItalic.ttf new file mode 100644 index 0000000000..59b6d16b06 Binary files /dev/null and b/catalog-ui/src/assets/styles/fonts/OpenSans/OpenSans-SemiboldItalic.ttf differ diff --git a/catalog-ui/src/assets/styles/layout/sidebar.less b/catalog-ui/src/assets/styles/layout/sidebar.less index 9b8dc240c7..d1df041d6e 100644 --- a/catalog-ui/src/assets/styles/layout/sidebar.less +++ b/catalog-ui/src/assets/styles/layout/sidebar.less @@ -129,12 +129,12 @@ /* Dashboard (Non Catalog) */ .i-sdc-left-sidebar-item { list-style: none; - .m_14_r; + .m_13_r; line-height: 24px; &.category-title { text-transform: uppercase; - .l_14_m; + .l_13_m; line-height: 30px; } diff --git a/catalog-ui/src/assets/styles/mixins.less b/catalog-ui/src/assets/styles/mixins.less index 7ce9906d88..4a0356d810 100644 --- a/catalog-ui/src/assets/styles/mixins.less +++ b/catalog-ui/src/assets/styles/mixins.less @@ -31,63 +31,63 @@ .f-type { ._36 { - font-family: @font-omnes-light; + font-family: @font-opensans-light; font-size: 36px; } ._24 { - font-family: @font-omnes-light; + font-family: @font-opensans-light; font-size: 24px; } ._18_r { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 18px; } ._18_m { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 18px; } ._16_r { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 16px; } ._16_m { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 16px; } ._14_r { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 14px; } ._14_m { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 14px; } ._14_i { - font-family: @font-omnes-medium-italic; + font-family: @font-opensans-medium-italic; font-size: 14px; } ._13_r { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 13px; } ._13_m { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 13px; } ._13_i { - font-family: @font-omnes-medium-italic; + font-family: @font-opensans-medium-italic; font-size: 13px; } ._12_r { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 12px; } ._12_m { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 12px; } ._12_i { - font-family: @font-omnes-medium-italic; + font-family: @font-opensans-medium-italic; font-size: 12px; } } diff --git a/catalog-ui/src/assets/styles/mixins_old.less b/catalog-ui/src/assets/styles/mixins_old.less index 8a4f609497..29c9574565 100644 --- a/catalog-ui/src/assets/styles/mixins_old.less +++ b/catalog-ui/src/assets/styles/mixins_old.less @@ -62,79 +62,79 @@ .font-type { ._1 { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 14px; } ._2 { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 20px; } ._3 { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 12px; } ._4 { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 16px; } ._5 { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 30px; } ._6 { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 16px; } ._7 { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 14px; } ._8 { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 11px; } ._9 { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 13px; } ._10 { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 18px; } ._11 { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 20px; } ._12 { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 17px; } ._13 { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 12px; } ._14 { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 11px; } ._15 { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 24px; } ._16 { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 10px; } ._17 { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 15px; } ._18 { - font-family: @font-omnes-regular; + font-family: @font-opensans-regular; font-size: 15px; } ._19 { - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; font-size: 18px; } } diff --git a/catalog-ui/src/assets/styles/sdc-ui.css b/catalog-ui/src/assets/styles/sdc-ui.css index 5247ecda1a..ad96e7762a 100644 --- a/catalog-ui/src/assets/styles/sdc-ui.css +++ b/catalog-ui/src/assets/styles/sdc-ui.css @@ -159,7 +159,7 @@ fieldset label { .heading-5-medium, .catalog-tile .catalog-tile-top .catalog-tile-item-name, .sdc-tile-catalog .sdc-tile-content .sdc-tile-content-info .sdc-tile-content-info-item-name { font-weight: 400; line-height: 16px; - font-size: 16px; } + font-size: 14px; } .body-1 { font-weight: 400; @@ -175,7 +175,7 @@ fieldset label { .body-2, .catalog-tile .catalog-tile-top .catalog-tile-entity-details .catalog-tile-version-info .catalog-tile-item-version, .catalog-tile .catalog-tile-content .catalog-tile-locking-user-name, .sdc-tile-catalog .sdc-tile-content .sdc-tile-content-info .sdc-tile-content-info-version-info .sdc-tile-content-info-version-info-text, .sdc-tile-catalog .sdc-tile-footer .sdc-tile-footer-text { font-weight: 400; - font-size: 13px; } + font-size: 12px; } .body-2-medium, .catalog-tile .catalog-tile-content { font-weight: 600; @@ -304,7 +304,7 @@ fieldset label { .sdc-tile-catalog .sdc-tile-header { line-height: 16px; } .sdc-tile-catalog .sdc-tile-header .sdc-tile-header-type { - font-size: 16px; + font-size: 14px; text-transform: uppercase; } .sdc-tile-catalog .sdc-tile-header .sdc-tile-header-type.purple { color: #9063cd; } diff --git a/catalog-ui/src/assets/styles/tlv-buttons.less b/catalog-ui/src/assets/styles/tlv-buttons.less index 0e42a92231..92d7b5c8fc 100644 --- a/catalog-ui/src/assets/styles/tlv-buttons.less +++ b/catalog-ui/src/assets/styles/tlv-buttons.less @@ -2,14 +2,14 @@ border-radius: 2px; cursor: pointer; display: inline-block; - font-family: omnes-medium, Sans-Serif; + font-family: @font-opensans-medium; height: 32px; min-width: 96px; line-height: 30px; padding: 0 16px; text-align: center; vertical-align: middle; - font-size: 14px; + font-size: 12px; &:disabled { opacity: .4; diff --git a/catalog-ui/src/assets/styles/variables-old.less b/catalog-ui/src/assets/styles/variables-old.less index a4e707a076..57f3fc24b8 100644 --- a/catalog-ui/src/assets/styles/variables-old.less +++ b/catalog-ui/src/assets/styles/variables-old.less @@ -70,8 +70,8 @@ @border_color_view-mode: #ededed; /* Fonts */ -@font-omnes-light: omnes-light, sans-serif; -@font-omnes-regular: omnes-regular, sans-serif; -@font-omnes-medium: omnes-medium, sans-serif; -@font-omnes-medium-italic: omnes-medium-italic, sans-serif; -@font-omnes-bold: omnes-bold, sans-serif; +@font-opensans-light: OpenSans-Light, sans-serif; +@font-opensans-regular: OpenSans-Regular, sans-serif; +@font-opensans-medium: OpenSans-Semibold, sans-serif; +@font-opensans-medium-italic: OpenSans-SemiboldItalic, sans-serif; +@font-opensans-bold: OpenSans-Bold, sans-serif; diff --git a/catalog-ui/src/assets/styles/variables.less b/catalog-ui/src/assets/styles/variables.less index dbed6baf3f..3c23bdbe5e 100644 --- a/catalog-ui/src/assets/styles/variables.less +++ b/catalog-ui/src/assets/styles/variables.less @@ -1,9 +1,9 @@ /* Fonts */ -@font-omnes-light: omnes-light, sans-serif; -@font-omnes-regular: omnes-regular, sans-serif; -@font-omnes-medium: omnes-medium, sans-serif; -@font-omnes-medium-italic: omnes-medium-italic, sans-serif; -@font-omnes-bold: omnes-bold, sans-serif; +@font-opensans-light: OpenSans-Light, sans-serif; +@font-opensans-regular: OpenSans-Regular, sans-serif; +@font-opensans-medium: OpenSans-Semibold, sans-serif; +@font-opensans-medium-italic: OpenSans-SemiboldItalic, sans-serif; +@font-opensans-bold: OpenSans-Bold, sans-serif; /*---------------------------------------------- General ----------------------------------------------*/ @images: "images"; @@ -48,4 +48,4 @@ @top_nav_admin_height: 44px; @action_nav_height: 53px; @footer_height: 89px; -@border_color_view-mode: #ededed; \ No newline at end of file +@border_color_view-mode: #ededed; diff --git a/catalog-ui/src/main.ts b/catalog-ui/src/main.ts index 7a321f7367..20e4352901 100644 --- a/catalog-ui/src/main.ts +++ b/catalog-ui/src/main.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + //import './app/app.ts'; import {ng1appModule} from './app/app'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; diff --git a/catalog-ui/src/polyfills.ts b/catalog-ui/src/polyfills.ts index 3a5bfc592a..59846fce92 100644 --- a/catalog-ui/src/polyfills.ts +++ b/catalog-ui/src/polyfills.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + // This file includes polyfills needed by Angular and is loaded before the app. // You can add your own extra polyfills to this file. import 'core-js/es6/symbol'; diff --git a/catalog-ui/src/typings/cytoscape/cytoscape-extension.ts b/catalog-ui/src/typings/cytoscape/cytoscape-extension.ts index 88843af088..6f4642af70 100644 --- a/catalog-ui/src/typings/cytoscape/cytoscape-extension.ts +++ b/catalog-ui/src/typings/cytoscape/cytoscape-extension.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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========================================================= + */ + /** * Created by obarda on 12/21/2016. */ @@ -37,4 +57,4 @@ declare module Cy { cueOffset: number; // expandCollapseCuePosition: string; } -} \ No newline at end of file +} diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/jsongraph/util/CommonUtility.java b/common-app-api/src/main/java/org/openecomp/sdc/common/jsongraph/util/CommonUtility.java index 8f94d8042c..dfcf5b58c0 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/jsongraph/util/CommonUtility.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/jsongraph/util/CommonUtility.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.common.jsongraph.util; import org.slf4j.Logger; diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/util/PairUtils.java b/common-app-api/src/main/java/org/openecomp/sdc/common/util/PairUtils.java index 3dd313b824..eb6c29ce4a 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/util/PairUtils.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/util/PairUtils.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.common.util; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinition.java index 0a98a2abda..8ec5a89c44 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.io.Serializable; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CompositionDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CompositionDataDefinition.java index 2ba460b9ab..853e7cf261 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CompositionDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CompositionDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.HashMap; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InputDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InputDataDefinition.java index fd69127ed3..3406d85c82 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InputDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InputDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.Map; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListCapabilityDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListCapabilityDataDefinition.java index c986c0fe7e..57e1c2154f 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListCapabilityDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListCapabilityDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.List; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinition.java index 825e65ea18..424b15059e 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.ArrayList; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListMapPropertiesDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListMapPropertiesDataDefinition.java index e611666d3e..d0a1465096 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListMapPropertiesDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListMapPropertiesDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.List; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinition.java index fb1248d100..b601fb0988 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.List; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapArtifactDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapArtifactDataDefinition.java index 4c61dd2b81..db32d56c3a 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapArtifactDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapArtifactDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.Map; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapCapabiltyProperty.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapCapabiltyProperty.java index 42d3f49a7d..6814d41914 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapCapabiltyProperty.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapCapabiltyProperty.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.Map; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinition.java index 69eecf45c4..537d9502cd 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.HashMap; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapGroupsDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapGroupsDataDefinition.java index acd1a182a6..983f1434c5 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapGroupsDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapGroupsDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.Map; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapListCapabiltyDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapListCapabiltyDataDefinition.java index 3053f99ab2..37703df631 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapListCapabiltyDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapListCapabiltyDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.HashMap; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapListRequirementDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapListRequirementDataDefinition.java index 80c2060333..2144dcac69 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapListRequirementDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapListRequirementDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.HashMap; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapPropertiesDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapPropertiesDataDefinition.java index e90fc916e8..a2a59ad778 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapPropertiesDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapPropertiesDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.util.Map; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinition.java index 7defd1df3c..59b14b3060 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.elements; import java.io.Serializable; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ComponentFieldsEnum.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ComponentFieldsEnum.java index 78261ff07a..9bef5ce887 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ComponentFieldsEnum.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ComponentFieldsEnum.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.enums; public enum ComponentFieldsEnum { diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/GraphPropertyEnum.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/GraphPropertyEnum.java index 5a7b2d40f3..276fbe24a7 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/GraphPropertyEnum.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/GraphPropertyEnum.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.enums; import java.util.ArrayList; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java index f5cc2b661b..9dfc3b602a 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.enums; import org.codehaus.jackson.annotate.JsonCreator; diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/tosca/ToscaDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/tosca/ToscaDataDefinition.java index 70eaa700aa..eba27fb48b 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/tosca/ToscaDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/tosca/ToscaDataDefinition.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.be.datatypes.tosca; import java.util.HashMap; diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java index b145b38355..995044588c 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java @@ -78,6 +78,7 @@ import org.openecomp.sdc.vendorsoftwareproduct.errors.PackageInvalidErrorBuilder import org.openecomp.sdc.vendorsoftwareproduct.errors.PackageNotFoundErrorBuilder; import org.openecomp.sdc.vendorsoftwareproduct.errors.TranslationFileCreationErrorBuilder; import org.openecomp.sdc.vendorsoftwareproduct.errors.VendorSoftwareProductInvalidErrorBuilder; +import org.openecomp.sdc.vendorsoftwareproduct.factory.CompositionEntityDataManagerFactory; import org.openecomp.sdc.vendorsoftwareproduct.informationArtifact.InformationArtifactGenerator; import org.openecomp.sdc.vendorsoftwareproduct.services.composition.CompositionEntityDataManager; import org.openecomp.sdc.vendorsoftwareproduct.services.schemagenerator.SchemaGenerator; @@ -137,7 +138,6 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa private EnrichedServiceModelDao enrichedServiceModelDao; private HealingManager healingManager; private VendorLicenseArtifactsService licenseArtifactsService; - private CompositionEntityDataManager compositionEntityDataManager; private InformationArtifactGenerator informationArtifactGenerator; private PackageInfoDao packageInfoDao; private ActivityLogManager activityLogManager; @@ -153,7 +153,6 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa EnrichedServiceModelDao enrichedServiceModelDao, HealingManager healingManager, VendorLicenseArtifactsService licenseArtifactsService, - CompositionEntityDataManager compositionEntityDataManager, InformationArtifactGenerator informationArtifactGenerator, PackageInfoDao packageInfoDao, ActivityLogManager activityLogManager) { @@ -166,7 +165,6 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa this.enrichedServiceModelDao = enrichedServiceModelDao; this.healingManager = healingManager; this.licenseArtifactsService = licenseArtifactsService; - this.compositionEntityDataManager = compositionEntityDataManager; this.informationArtifactGenerator = informationArtifactGenerator; this.packageInfoDao = packageInfoDao; this.activityLogManager = activityLogManager; @@ -479,11 +477,12 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa vsp.setValidationDataStructure(null); vsps.add(new VersionedVendorSoftwareProductInfo(vsp, versionInfo)); } - }catch(RuntimeException rte){ - logger.error("Error trying to retrieve vsp["+entry.getKey()+"] version["+version.toString - ()+"] " + - "message:"+rte - .getMessage()); + } catch (RuntimeException rte) { + logger.error( + "Error trying to retrieve vsp[" + entry.getKey() + "] version[" + version.toString + () + "] " + + "message:" + rte + .getMessage()); } } @@ -543,11 +542,11 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa autoHeal(vspId, checkoutVersion, vendorSoftwareProductInfo, user); return checkin(vspId, user); case Final: - Version checkoutFinalVersion = checkout(vspId,user); + Version checkoutFinalVersion = checkout(vspId, user); autoHeal(vspId, checkoutFinalVersion, vendorSoftwareProductInfo, user); - Version checkinFinalVersion = checkin(vspId,user); + Version checkinFinalVersion = checkin(vspId, user); ValidationResponse response = submit(vspId, user); - if(!response.isValid()) { + if (!response.isValid()) { return checkout(vspId, user); } @@ -828,7 +827,10 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa private QuestionnaireValidationResult validateQuestionnaire(String vspId, Version version) { mdcDataDebugMessage.debugEntryMessage("VSP id", vspId); - + // The apis of CompositionEntityDataManager used here are stateful! + // so, it must be re-created from scratch when it is used! + CompositionEntityDataManager compositionEntityDataManager = + CompositionEntityDataManagerFactory.getInstance().createInterface(); compositionEntityDataManager .addEntity(vspInfoDao.getQuestionnaire(vspId, version), null); diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VspManagerFactoryImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VspManagerFactoryImpl.java index 16f17e6192..3751195d6c 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VspManagerFactoryImpl.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VspManagerFactoryImpl.java @@ -32,7 +32,6 @@ import org.openecomp.sdc.vendorsoftwareproduct.dao.OrchestrationTemplateDaoFacto import org.openecomp.sdc.vendorsoftwareproduct.dao.PackageInfoDaoFactory; import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductDaoFactory; import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDaoFactory; -import org.openecomp.sdc.vendorsoftwareproduct.factory.CompositionEntityDataManagerFactory; import org.openecomp.sdc.vendorsoftwareproduct.factory.InformationArtifactGeneratorFactory; import org.openecomp.sdc.versioning.VersioningManagerFactory; @@ -48,7 +47,6 @@ public class VspManagerFactoryImpl extends VspManagerFactory { EnrichedServiceModelDaoFactory.getInstance().createInterface(), HealingManagerFactory.getInstance().createInterface(), VendorLicenseArtifactServiceFactory.getInstance().createInterface(), - CompositionEntityDataManagerFactory.getInstance().createInterface(), InformationArtifactGeneratorFactory.getInstance().createInterface(), PackageInfoDaoFactory.getInstance().createInterface(), ActivityLogManagerFactory.getInstance().createInterface()); diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImplTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImplTest.java index 540df7d5ed..5a2f76b6fa 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImplTest.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImplTest.java @@ -56,9 +56,11 @@ import org.openecomp.sdc.vendorsoftwareproduct.dao.PackageInfoDao; import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductDao; import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDao; import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.NicEntity; import org.openecomp.sdc.vendorsoftwareproduct.dao.type.PackageInfo; import org.openecomp.sdc.vendorsoftwareproduct.dao.type.UploadDataEntity; import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspQuestionnaireEntity; import org.openecomp.sdc.vendorsoftwareproduct.errors.VendorSoftwareProductErrorCodes; import org.openecomp.sdc.vendorsoftwareproduct.impl.mock.EnrichmentManagerFactoryImpl; import org.openecomp.sdc.vendorsoftwareproduct.informationArtifact.InformationArtifactGenerator; @@ -284,7 +286,7 @@ public class VendorSoftwareProductManagerImplTest { assertVspsEquals(vsp, vspToCreate); verify(activityLogManagerMock).addActionLog(activityLogEntityArg.capture(), eq(USER1)); ActivityLogEntity activityLogEntity = activityLogEntityArg.getValue(); - Assert.assertEquals(activityLogEntity.getVersionId(), String.valueOf(VERSION01.getMajor()+1)); + Assert.assertEquals(activityLogEntity.getVersionId(), String.valueOf(VERSION01.getMajor() + 1)); Assert.assertTrue(activityLogEntity.isSuccess()); } @@ -409,7 +411,7 @@ public class VendorSoftwareProductManagerImplTest { USER1, null); verify(activityLogManagerMock).addActionLog(activityLogEntityArg.capture(), eq(USER1)); ActivityLogEntity activityLogEntity = activityLogEntityArg.getValue(); - Assert.assertEquals(activityLogEntity.getVersionId(), String.valueOf(VERSION01.getMajor()+1)); + Assert.assertEquals(activityLogEntity.getVersionId(), String.valueOf(VERSION01.getMajor() + 1)); Assert.assertTrue(activityLogEntity.isSuccess()); } @@ -427,7 +429,7 @@ public class VendorSoftwareProductManagerImplTest { verify(activityLogManagerMock).addActionLog(activityLogEntityArg.capture(), eq(USER1)); ActivityLogEntity activityLogEntity = activityLogEntityArg.getValue(); - Assert.assertEquals(activityLogEntity.getVersionId(), String.valueOf(VERSION01.getMajor()+1)); + Assert.assertEquals(activityLogEntity.getVersionId(), String.valueOf(VERSION01.getMajor() + 1)); Assert.assertTrue(activityLogEntity.isSuccess()); } @@ -459,6 +461,7 @@ public class VendorSoftwareProductManagerImplTest { public void testSubmitWithMissingData() throws IOException { VersionInfo versionInfo = new VersionInfo(); versionInfo.setActiveVersion(VERSION01); + doReturn(versionInfo).when(versioningManagerMock).getEntityVersionInfo( VendorSoftwareProductConstants.VENDOR_SOFTWARE_PRODUCT_VERSIONABLE_TYPE, VSP_ID, USER1, VersionableEntityAction.Read); @@ -466,6 +469,20 @@ public class VendorSoftwareProductManagerImplTest { VspDetails vsp = new VspDetails(VSP_ID, VERSION01); doReturn(vsp).when(vspInfoDaoMock).get(anyObject()); + VspQuestionnaireEntity vspQuestionnaire = new VspQuestionnaireEntity(VSP_ID, VERSION01); + vspQuestionnaire.setQuestionnaireData("{}"); + doReturn(vspQuestionnaire).when(vspInfoDaoMock).getQuestionnaire(VSP_ID, VERSION01); + + ComponentEntity comp1 = new ComponentEntity(VSP_ID, VERSION01, "comp1"); + comp1.setQuestionnaireData("{}"); + doReturn(Collections.singleton(comp1)).when(vendorSoftwareProductDaoMock) + .listComponentsCompositionAndQuestionnaire(VSP_ID, VERSION01); + + NicEntity nic1 = new NicEntity(VSP_ID, VERSION01, "comp1", "nic1"); + nic1.setQuestionnaireData("{}"); + doReturn(Collections.singleton(nic1)) + .when(vendorSoftwareProductDaoMock).listNicsByVsp(VSP_ID, VERSION01); + ValidationResponse validationResponse = vendorSoftwareProductManager.submit(VSP_ID, USER1); Assert.assertNotNull(validationResponse); Assert.assertFalse(validationResponse.isValid()); @@ -477,7 +494,7 @@ public class VendorSoftwareProductManagerImplTest { verify(versioningManagerMock, never()) .submit(VendorSoftwareProductConstants.VENDOR_SOFTWARE_PRODUCT_VERSIONABLE_TYPE, VSP_ID, USER1, null); - verify(activityLogManagerMock, never()).addActionLog(any(ActivityLogEntity.class),eq(USER1)); + verify(activityLogManagerMock, never()).addActionLog(any(ActivityLogEntity.class), eq(USER1)); } // TODO: 3/15/2017 fix and enable @@ -549,7 +566,7 @@ public class VendorSoftwareProductManagerImplTest { verify(versioningManagerMock) .submit(VendorSoftwareProductConstants.VENDOR_SOFTWARE_PRODUCT_VERSIONABLE_TYPE, VSP_ID, USER1, null); - verify(activityLogManagerMock).addActionLog(activityLogEntityArg.capture(),eq(USER1)); + verify(activityLogManagerMock).addActionLog(activityLogEntityArg.capture(), eq(USER1)); ActivityLogEntity activityLogEntity = activityLogEntityArg.getValue(); Assert.assertEquals(activityLogEntity.getVersionId(), String.valueOf(VERSION10.getMajor())); Assert.assertTrue(activityLogEntity.isSuccess()); @@ -612,7 +629,7 @@ public class VendorSoftwareProductManagerImplTest { Assert.assertEquals(ce.getMessage(), Messages.CREATE_MANIFEST_FROM_ZIP.getErrorMessage()); } - verify(activityLogManagerMock, never()).addActionLog(any(ActivityLogEntity.class),eq(USER1)); + verify(activityLogManagerMock, never()).addActionLog(any(ActivityLogEntity.class), eq(USER1)); } /* @Test diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonUtil.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonUtil.java index 87c75fce62..5f0bc90845 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonUtil.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonUtil.java @@ -25,7 +25,6 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonIOException; import com.google.gson.JsonParser; import com.google.gson.JsonSyntaxException; - import org.apache.commons.collections4.CollectionUtils; import org.everit.json.schema.EnumSchema; import org.everit.json.schema.Schema; @@ -33,6 +32,8 @@ import org.everit.json.schema.ValidationException; import org.everit.json.schema.loader.SchemaLoader; import org.json.JSONObject; import org.openecomp.core.utilities.CommonMethods; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import java.io.BufferedReader; import java.io.IOException; @@ -49,6 +50,7 @@ import java.util.stream.Collectors; * The type Json util. */ public class JsonUtil { + private static final Logger logger = LoggerFactory.getLogger(JsonUtil.class); /** * Object 2 json string. @@ -163,13 +165,15 @@ public class JsonUtil { Set possibleValues = ((EnumSchema) exception.getViolatedSchema()).getPossibleValues(); return exception.getMessage().replaceFirst("enum value", possibleValues.size() == 1 ? String.format("value. %s is the only possible value for this field", - possibleValues.iterator().next()) + possibleValues.iterator().next()) : String.format("value. Possible values: %s", CommonMethods .collectionToCommaSeparatedString( possibleValues.stream().map(Object::toString).collect(Collectors.toList())))); } private static List validateUsingEverit(String json, String jsonSchema) { + logger.debug( + String.format("validateUsingEverit start, json=%s, jsonSchema=%s", json, jsonSchema)); if (json == null || jsonSchema == null) { throw new IllegalArgumentException("Input strings json and jsonSchema can not be null"); } diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml index 96951de82a..92e50063dd 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml @@ -28,6 +28,11 @@ openecomp-sdc-validation-api ${project.version} + + org.openecomp.sdc + openecomp-sdc-versioning-api + ${project.version} + diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/src/main/java/org/openecomp/sdc/healing/types/HealingContext.java b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/src/main/java/org/openecomp/sdc/healing/types/HealingContext.java new file mode 100644 index 0000000000..2ad143a0ec --- /dev/null +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/src/main/java/org/openecomp/sdc/healing/types/HealingContext.java @@ -0,0 +1,41 @@ +package org.openecomp.sdc.healing.types; +import org.openecomp.sdc.versioning.dao.types.Version; + +/** + * Created by TALIO on 7/3/2017. + */ +public class HealingContext { + private String vspId; + private Version version; + private String user; + + public HealingContext(String vspId, Version version, String user) { + this.vspId = vspId; + this.version = version; + this.user = user; + } + + public String getVspId() { + return vspId; + } + + public void setVspId(String vspId) { + this.vspId = vspId; + } + + public Version getVersion() { + return version; + } + + public void setVersion(Version version) { + this.version = version; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/src/main/resources/healingConfiguration.json b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/src/main/resources/healingConfiguration.json index 23427ceb6a..fa79627575 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/src/main/resources/healingConfiguration.json +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/src/main/resources/healingConfiguration.json @@ -3,5 +3,6 @@ "QUESTIONNAIRE_HEALER" : "org.openecomp.sdc.healing.healers.VspQuestionnaireHealer", "COMPOSITION_DATA_HEALER" : "org.openecomp.sdc.healing.healers.CompositionDataHealer", "SUB_ENTITIES_HEALER" : "org.openecomp.sdc.healing.healers.SubEntitiesQuestionnaireHealer", - "HEAT_TOSCA_TRANSLATION_HEALER" : "org.openecomp.sdc.healing.healers.HeatToToscaTranslationHealer" + "HEAT_TOSCA_TRANSLATION_HEALER" : "org.openecomp.sdc.healing.healers.HeatToToscaTranslationHealer", + "VLM_VERSION_HEALER" : "org.openecomp.sdc.healing.healers.VlmVersionHealer" } \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml index 70d40be2a6..bdbf985832 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml @@ -29,6 +29,16 @@ ${project.version} runtime + + org.openecomp.sdc + openecomp-sdc-vendor-license-api + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-vendor-license-api + ${project.version} + diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/VlmVersionHealer.java b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/VlmVersionHealer.java new file mode 100644 index 0000000000..5eb15bf9ba --- /dev/null +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/VlmVersionHealer.java @@ -0,0 +1,73 @@ +package org.openecomp.sdc.healing.healers; + +import org.openecomp.sdc.common.utils.SdcCommon; +import org.openecomp.sdc.healing.interfaces.Healer; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; +import org.openecomp.sdc.vendorlicense.dao.LicenseAgreementDao; +import org.openecomp.sdc.vendorlicense.dao.LicenseAgreementDaoFactory; +import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity; +import org.openecomp.sdc.vendorlicense.dao.types.VendorLicenseModelEntity; +import org.openecomp.sdc.vendorlicense.facade.VendorLicenseFacade; +import org.openecomp.sdc.vendorlicense.facade.VendorLicenseFacadeFactory; +import org.openecomp.sdc.vendorlicense.types.VersionedVendorLicenseModel; +import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductDaoFactory; +import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDao; +import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDaoFactory; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails; +import org.openecomp.sdc.versioning.dao.types.Version; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +/** + * Created by TALIO on 7/3/2017. + */ +public class VlmVersionHealer implements Healer { + private static final VendorLicenseFacade vendorLicenseFacade = + VendorLicenseFacadeFactory.getInstance().createInterface(); + private static final VendorSoftwareProductInfoDao vspInfoDao = + VendorSoftwareProductInfoDaoFactory.getInstance().createInterface(); + private static final LicenseAgreementDao licenseAgreementDao = + LicenseAgreementDaoFactory.getInstance().createInterface(); + private static final Logger logger = + LoggerFactory.getLogger(VlmVersionHealer.class); + + @Override + public Object heal(Map healingParams) throws Exception { + String vspId = (String) healingParams.get(SdcCommon.VSP_ID); + Version version = (Version) healingParams.get(SdcCommon.VERSION); + String user = (String) healingParams.get(SdcCommon.USER); + + VspDetails vspDetails = vspInfoDao.get(new VspDetails(vspId, version)); + VersionedVendorLicenseModel vendorLicenseModel; + + try{ + vendorLicenseModel = + vendorLicenseFacade.getVendorLicenseModel(vspDetails.getVendorId(), null, user); + } catch (Exception e){ + logger.debug("No Vlm was found for Vsp " + vspDetails.getName()); + return Optional.empty(); + } + + VendorLicenseModelEntity vlm = vendorLicenseModel.getVendorLicenseModel(); + String vlmId = vlm.getId(); + Version vlmVersion = vlm.getVersion(); + + List laList = + new ArrayList<>( + licenseAgreementDao.list(new LicenseAgreementEntity(vlmId, vlmVersion, null))); + + vspDetails.setVlmVersion(vlmVersion); + vspDetails.setLicenseAgreement(laList.get(0).getId()); + vspDetails.setFeatureGroups(new ArrayList<>(laList.get(0).getFeatureGroupIds())); + + vspInfoDao.update(vspDetails); + + return vspDetails; + + } +} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java index 227683603d..7401ac5f2c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java @@ -455,6 +455,16 @@ public class TranslationContext { .isNestedServiceTemplateWasHandled(nestedServiceTemplateFileName); } + public Set getAllRelatedNestedNodeTypeIds(){ + String globalName = "GlobalSubstitutionTypes"; + if(Objects.isNull(this.unifiedSubstitutionData) || + Objects.isNull(this.unifiedSubstitutionData.get(globalName))){ + return new HashSet<>(); + } + + return this.unifiedSubstitutionData.get(globalName).getAllRelatedNestedNodeTypeIds(); + } + public void addNestedFileToUsedNestedComputeType(String serviceTemplateName, String nestedServiceTemplateFileName, String computeType){ diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/UnifiedSubstitutionData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/UnifiedSubstitutionData.java index ae3d888736..c7fb7bb75a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/UnifiedSubstitutionData.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/UnifiedSubstitutionData.java @@ -1,5 +1,6 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition; +import org.apache.commons.collections4.MapUtils; import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; import java.util.Collection; @@ -106,6 +107,13 @@ public class UnifiedSubstitutionData { : Optional.of(this.nestedNodeTypeRelatedUnifiedTranslatedId.get(nestedNodeTypeId)); } + public Set getAllRelatedNestedNodeTypeIds(){ + if(MapUtils.isEmpty(nestedNodeTypeRelatedUnifiedTranslatedId)){ + return new HashSet<>(); + } + return new HashSet<>(this.nestedNodeTypeRelatedUnifiedTranslatedId.values()); + } + public void addHandledComputeType(String nestedServiceTemplateFileName, String handledComputeType) { @@ -147,7 +155,9 @@ public class UnifiedSubstitutionData { public void addNewPropertyIdToNodeTemplate(String newPropertyId, Object origPropertyValue){ - newParameterIdsToPropertiesFromOrigNodeTemplate.putIfAbsent(newPropertyId, origPropertyValue); + if(!newParameterIdsToPropertiesFromOrigNodeTemplate.containsKey(newPropertyId)) { + newParameterIdsToPropertiesFromOrigNodeTemplate.put(newPropertyId, origPropertyValue); + } } public Optional getNewPropertyInputParam(String newPropertyId){ diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java index d5a87ad668..185316dad7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java @@ -2642,12 +2642,17 @@ public class UnifiedCompositionService { String newNestedNodeTypeId, ServiceTemplate globalSubstitutionServiceTemplate, TranslationContext context) { - Map nodeTypes = globalSubstitutionServiceTemplate.getNode_types(); - NodeType nested = DataModelUtil.getNodeType(globalSubstitutionServiceTemplate, - origNestedNodeTypeId); - setNewValuesForNestedNodeType(origNestedNodeTypeId, newNestedNodeTypeId, nested, nodeTypes); - context.addUnifiedNestedNodeTypeId(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME, - origNestedNodeTypeId, newNestedNodeTypeId); + Set relatedNestedNodeTypeIds = + context.getAllRelatedNestedNodeTypeIds(); + + if(!relatedNestedNodeTypeIds.contains(origNestedNodeTypeId)) { + Map nodeTypes = globalSubstitutionServiceTemplate.getNode_types(); + NodeType nested = DataModelUtil.getNodeType(globalSubstitutionServiceTemplate, + origNestedNodeTypeId); + setNewValuesForNestedNodeType(origNestedNodeTypeId, newNestedNodeTypeId, nested, nodeTypes); + context.addUnifiedNestedNodeTypeId(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME, + origNestedNodeTypeId, newNestedNodeTypeId); + } } private void setNewValuesForNestedNodeType(String origNestedNodeType, diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedSingleComputeFullTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedSingleComputeFullTest.java index 9f3232eaca..f52f43577e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedSingleComputeFullTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedSingleComputeFullTest.java @@ -164,4 +164,14 @@ public class UnifiedCompositionNestedSingleComputeFullTest extends BaseFullTrans testTranslationWithInit(); } + + @Test + public void testMultipleReferencesToSameNestedFilesWithSameComputeType() throws IOException { + inputFilesPath = + "/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in"; + outputFilesPath = + "/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out"; + + testTranslationWithInit(); + } } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/MANIFEST.json new file mode 100644 index 0000000000..b13b3c8c65 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/MANIFEST.json @@ -0,0 +1,250 @@ +{ + "name": "", + "description": "", + "data": [ + { + "file": "module_0_vson_mgt.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "module_0_vson_mgt.env", + "type": "HEAT_ENV" + }, + { + "file": "module_0_vson_mgt_volume.yaml", + "type": "HEAT_VOL", + "isBase": "false", + "data": [ + { + "file": "module_0_vson_mgt_volume.env", + "type": "HEAT_ENV" + } + ] + } + ] + }, + { + "file": "module_1_vson_mon.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "module_1_vson_mon.env", + "type": "HEAT_ENV" + }, + { + "file": "module_1_vson_mon_volume.yaml", + "type": "HEAT_VOL", + "isBase": "false", + "data": [ + { + "file": "module_1_vson_mon_volume.env", + "type": "HEAT_ENV" + } + ] + } + ] + }, + { + "file": "nested_vson_server_from_vol.yaml", + "type": "HEAT", + "isBase": "false" + }, + { + "file": "module_7_vson_app.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "module_7_vson_app.env", + "type": "HEAT_ENV" + }, + { + "file": "module_7_vson_app_volume.yaml", + "type": "HEAT_VOL", + "isBase": "false", + "data": [ + { + "file": "module_7_vson_app_volume.env", + "type": "HEAT_ENV" + } + ] + } + ] + }, + { + "file": "module_8_vson_dcl.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "module_8_vson_dcl.env", + "type": "HEAT_ENV" + }, + { + "file": "module_8_vson_dcl_volume.yaml", + "type": "HEAT_VOL", + "isBase": "false", + "data": [ + { + "file": "module_8_vson_dcl_volume.env", + "type": "HEAT_ENV" + } + ] + } + ] + }, + { + "file": "nested_vson_server_with_vol.yaml", + "type": "HEAT", + "isBase": "false" + }, + { + "file": "module_2_vson_mdr.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "module_2_vson_mdr.env", + "type": "HEAT_ENV" + }, + { + "file": "module_2_vson_mdr_volume.yaml", + "type": "HEAT_VOL", + "isBase": "false", + "data": [ + { + "file": "module_2_vson_mdr_volume.env", + "type": "HEAT_ENV" + } + ] + } + ] + }, + { + "file": "module_5_vson_dbg.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "module_5_vson_dbg.env", + "type": "HEAT_ENV" + }, + { + "file": "module_5_vson_dbg_volume.yaml", + "type": "HEAT_VOL", + "isBase": "false", + "data": [ + { + "file": "module_5_vson_dbg_volume.env", + "type": "HEAT_ENV" + } + ] + } + ] + }, + { + "file": "nested_vson_server_with_vol_dual_ip_stack.yaml", + "type": "HEAT", + "isBase": "false" + }, + { + "file": "module_9_vson_clm.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "module_9_vson_clm.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "module_3_vson_cll.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "module_3_vson_cll.env", + "type": "HEAT_ENV" + }, + { + "file": "module_3_vson_cll_volume.yaml", + "type": "HEAT_VOL", + "isBase": "false", + "data": [ + { + "file": "module_3_vson_cll_volume.env", + "type": "HEAT_ENV" + } + ] + } + ] + }, + { + "file": "module_6_vson_dbs.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "module_6_vson_dbs.env", + "type": "HEAT_ENV" + }, + { + "file": "module_6_vson_dbs_volume.yaml", + "type": "HEAT_VOL", + "isBase": "false", + "data": [ + { + "file": "module_6_vson_dbs_volume.env", + "type": "HEAT_ENV" + } + ] + } + ] + }, + { + "file": "nested_vson_server.yaml", + "type": "HEAT", + "isBase": "false" + }, + { + "file": "module_4_vson_dbc.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "module_4_vson_dbc.env", + "type": "HEAT_ENV" + }, + { + "file": "module_4_vson_dbc_volume.yaml", + "type": "HEAT_VOL", + "isBase": "false", + "data": [ + { + "file": "module_4_vson_dbc_volume.env", + "type": "HEAT_ENV" + } + ] + } + ] + }, + { + "file": "base_vson.yaml", + "type": "HEAT", + "isBase": "true", + "data": [ + { + "file": "base_vson.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "deploy.sh", + "type": "SHELL" + } + ] +} \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/base_vson.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/base_vson.env new file mode 100644 index 0000000000..a024b0f208 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/base_vson.env @@ -0,0 +1,135 @@ +parameters: + +### Global parameters + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique ID for this VF instance. +# vnf_id: 0 + +## Unique name for this VF module instance. +# vf_module_name: base_vson + +## Unique ID for this VF Module instance. +# vf_module_id: 0 + +### Network parameters + +## The ID of the OAM network. +# oam_net_id: bff05d9d-9384-45bb-82d0-3684a5372249 + +## Address length prefix for the subnet on the OAM network +# oam_net_subnet_prefix_length: 24 + +## Default gateway +# default_gateway: 172.20.50.1 + +## List of DNS servers +# dns_servers: 8.8.8.8 + +## List of NTP servers +# ntp_servers: 155.165.201.253,155.165.201.252,155.165.201.251 + +### ServerGroup parameters + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group is intended for Cluster Manager instances. + vson_clm_server_group_policy: anti-affinity + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group is intended for Cluster/DC leader instances. + vson_leader_server_group_policy: anti-affinity + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group is intended for DBC instances. + vson_dbc_server_group_policy: anti-affinity + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group is intended for DBG instances. + vson_dbg_server_group_policy: anti-affinity + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group is intended for DBS instances. + vson_dbs_server_group_policy: anti-affinity + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group is intended for MON instances. + vson_mon_server_group_policy: anti-affinity + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group is intended for Management instances. + vson_mgt_server_group_policy: anti-affinity + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group is intended for Mediator instances. + vson_mdr_server_group_policy: anti-affinity + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group is intended for Application instances. + vson_app_server_group_policy: anti-affinity + +### CLM parameters + +## vSON Cluster Management server Availability zone. +## NOTE: vSON Cluster Management server instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_0: nova + +## Unique name for the Cluster Manager instance. +# vson_clm_name_0: clm0 + +## Fixed IP assignment for vSON CLM instances on the OAM network. +# vson_clm_oam_net_ip_0: 172.20.50.250 + +## The ID or name of the Cluster Manager flavor. + vson_clm_flavor_name: vson-clm-flavor + +## Base VM Image name CLM instance will be created from. + vson_clm_image_name: VSON-BASE-1.0 + +## Master CLM IP. If the vSON Cluster belongs to a single OpenStack tenant, +## the value SHOULD BE EMPTY. +## In case the vSON Cluster is distributed between multiple tenants: +## -> vSON Cluster instantiation - the value should be empty +## -> Adding a new DC to existing vSON Cluster - IP of the CLM deployed during +## vSON Cluster instantiation, should be set as the value. +# vson_master_clm_ip: "" + +## vSON Cluster name. +# vson_cluster_name: VSON-CLU-1 + +### Swift parameters + +## Swift storage URL. +## Example: http://:8080/v1/AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 +## http://:8080 - protocol, IP and port, +## v1 - API version +## AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 - account ID +# swift_storage_url: http://10.56.124.51:8080/v1/AUTH_a9fa278da4ed430b9c09ad03670e63fa + +## Swift account auth token. +## Example: 041a5187bb4641f9b89583e2539776b0 +# swift_account_auth_token: 8bea874112134e8f9b6044cf504aed8b + +## Swift container storing vSON artifacts. + swift_son_container_name: vson + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/base_vson.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/base_vson.yaml new file mode 100644 index 0000000000..f8449d142a --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/base_vson.yaml @@ -0,0 +1,422 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# +description: > + Creates essential resources: + vSON internal network, Security Groups and + vSON Cluster Manager instance. + Deploys and configure appropriate software on the Cluster Management server. + Exposes shared resource as outputs that could be used by add-on templates. + +parameters: + +### vSON VF base global parameters + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance. + +### OAM network parameters + oam_net_id: + type: string + label: OAM network ID + description: Unique ID for the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: OAM network subnet prefix length. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + vson_clm_server_group_policy: + type: string + label: vSON Cluster Management server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON Cluster Management instances. + + vson_leader_server_group_policy: + type: string + label: vSON Cluster/DC leader server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON Cluster/DC leader instances. + + vson_dbc_server_group_policy: + type: string + label: vSON Database server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON Database instances. + + vson_dbg_server_group_policy: + type: string + label: vSON Database server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON DB Global instances. + + vson_dbs_server_group_policy: + type: string + label: vSON Database server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON DB Shard instances. + + vson_mon_server_group_policy: + type: string + label: vSON MON server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON MON instances. + + vson_mgt_server_group_policy: + type: string + label: vSON Management server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON Management instances. + + vson_mdr_server_group_policy: + type: string + label: vSON Mediator server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON Mediator instances. + + vson_app_server_group_policy: + type: string + label: vSON Application server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON Application instances. + +### CLM server parameters + availability_zone_0: + type: string + label: Availability zone 0 + description: > + vSON Cluster Management server Availability zone. + + vson_clm_name_0: + type: string + label: vSON Cluster Management server name + description: VM name for this vSON Cluster Management instance. + + vson_clm_oam_net_ip_0: + type: string + label: vSON CLM OAM network IP address + description: Fixed IP assignment for vSON CLM instances on the OAM network. + + vson_clm_flavor_name: + type: string + label: Flavor name + description: Cluster Manager VM flavor name. + + vson_clm_image_name: + type: string + label: vSON Cluster Manager VM image name + description: Image name the volume will be created from. + + vson_master_clm_ip: + type: string + label: vSON master CLM IP + description: > + Master CLM IP. If the vSON Cluster belongs to a single OpenStack tenant, + the value SHOULD BE EMPTY. + In case the vSON Cluster is distributed between multiple tenants: + -> vSON Cluster instantiation - the value should be empty + -> Adding a new DC to existing vSON Cluster - IP of the CLM deployed during + vSON Cluster instantiation, should be set as the value. + + vson_cluster_name: + type: string + label: vSON Cluster name + description: Name of the vSON Cluster. + constraints: + - length: { min: 1, max: 13 } + description: User name must be between 1 and 13 characters + + swift_storage_url: + type: string + label: swift storage URL + description: > + Swift storage URL. + Example: http://172.16.209.246:8080/v1/AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 + http://172.16.209.246:8080 - protocol, IP and port, + v1 - API version + AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 - account ID + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + + swift_son_container_name: + type: string + label: SON Swift + description: Swift container storing vSON artifacts. + +resources: + +# Server Group implements appropriate scheduling policy for vSON Cluster Management instances + vson_clm_server_group: + type: OS::Nova::ServerGroup + properties: + name: + str_replace: + template: VNF_NAME_clm_server_group + params: + VNF_NAME: {get_param: vnf_name} + policies: + - {get_param: vson_clm_server_group_policy} + +# Server Group implements appropriate scheduling policy for vSON Cluster/DC leaders + vson_leader_server_group: + type: OS::Nova::ServerGroup + properties: + name: + str_replace: + template: VNF_NAME_leader_server_group + params: + VNF_NAME: {get_param: vnf_name} + policies: + - {get_param: vson_leader_server_group_policy} + +# Server Group implements appropriate scheduling policy for vSON DBC instances + vson_dbc_server_group: + type: OS::Nova::ServerGroup + properties: + name: + str_replace: + template: VNF_NAME_dbc_server_group + params: + VNF_NAME: {get_param: vnf_name} + policies: + - {get_param: vson_dbc_server_group_policy} + +# Server Group implements appropriate scheduling policy for vSON DBG instances + vson_dbg_server_group: + type: OS::Nova::ServerGroup + properties: + name: + str_replace: + template: VNF_NAME_dbg_server_group + params: + VNF_NAME: {get_param: vnf_name} + policies: + - {get_param: vson_dbg_server_group_policy} + +# Server Group implements appropriate scheduling policy for vSON DBS instances + vson_dbs_server_group: + type: OS::Nova::ServerGroup + properties: + name: + str_replace: + template: VNF_NAME_dbs_server_group + params: + VNF_NAME: {get_param: vnf_name} + policies: + - {get_param: vson_dbs_server_group_policy} + +# Server Group implements appropriate scheduling policy for vSON MON instances + vson_mon_server_group: + type: OS::Nova::ServerGroup + properties: + name: + str_replace: + template: VNF_NAME_mon_server_group + params: + VNF_NAME: {get_param: vnf_name} + policies: + - {get_param: vson_mon_server_group_policy} + +# Server Group implements appropriate scheduling policy for vSON Management instances + vson_mgt_server_group: + type: OS::Nova::ServerGroup + properties: + name: + str_replace: + template: VNF_NAME_mgt_server_group + params: + VNF_NAME: {get_param: vnf_name} + policies: + - {get_param: vson_mgt_server_group_policy} + +# Server Group implements appropriate scheduling policy for vSON Mediator instances + vson_mdr_server_group: + type: OS::Nova::ServerGroup + properties: + name: + str_replace: + template: VNF_NAME_mdr_server_group + params: + VNF_NAME: {get_param: vnf_name} + policies: + - {get_param: vson_mdr_server_group_policy} + +# Server Group implements appropriate scheduling policy for vSON Application instances + vson_app_server_group: + type: OS::Nova::ServerGroup + properties: + name: + str_replace: + template: VNF_NAME_app_server_group + params: + VNF_NAME: {get_param: vnf_name} + policies: + - {get_param: vson_app_server_group_policy} + + oam_net_security_group: + type: OS::Neutron::SecurityGroup + properties: + description: Security Group for instances connected to the OAM network. + name: + str_replace: + template: VNF_NAME_oam_sec_group + params: + VNF_NAME: {get_param: vnf_name} + rules: + - {"direction": "egress", "remote_ip_prefix": "0.0.0.0/0", "protocol": "tcp", "ethertype": "IPv4", "port_range_max": 65535, "port_range_min": 1} + - {"direction": "egress", "remote_ip_prefix": "0.0.0.0/0", "protocol": "udp", "ethertype": "IPv4", "port_range_max": 65535, "port_range_min": 1} + - {"direction": "egress", "remote_ip_prefix": "0.0.0.0/0", "protocol": "47", "ethertype": "IPv4", "port_range_max": 65535, "port_range_min": 1} + - {"direction": "egress", "remote_ip_prefix": "0.0.0.0/0", "protocol": "icmp", "ethertype": "IPv4"} + - {"direction": "egress", "remote_ip_prefix": "::/0", "protocol": "tcp", "ethertype": "IPv6", "port_range_max": 65535, "port_range_min": 1} + - {"direction": "egress", "remote_ip_prefix": "::/0", "protocol": "udp", "ethertype": "IPv6", "port_range_max": 65535, "port_range_min": 1} + - {"direction": "egress", "remote_ip_prefix": "::/0", "protocol": "47", "ethertype": "IPv6", "port_range_max": 65535, "port_range_min": 1} + - {"direction": "egress", "remote_ip_prefix": "::/0", "protocol": "icmp", "ethertype": "IPv6"} + - {"direction": "ingress", "remote_ip_prefix": "0.0.0.0/0", "protocol": "tcp", "ethertype": "IPv4", "port_range_max": 65535, "port_range_min": 1} + - {"direction": "ingress", "remote_ip_prefix": "0.0.0.0/0", "protocol": "udp", "ethertype": "IPv4", "port_range_max": 65535, "port_range_min": 1} + - {"direction": "ingress", "remote_ip_prefix": "0.0.0.0/0", "protocol": "47", "ethertype": "IPv4", "port_range_max": 65535, "port_range_min": 1} + - {"direction": "ingress", "remote_ip_prefix": "0.0.0.0/0", "protocol": "icmp", "ethertype": "IPv4"} + - {"direction": "ingress", "remote_ip_prefix": "::/0", "protocol": "tcp", "ethertype": "IPv6", "port_range_max": 65535, "port_range_min": 1} + - {"direction": "ingress", "remote_ip_prefix": "::/0", "protocol": "udp", "ethertype": "IPv6", "port_range_max": 65535, "port_range_min": 1} + - {"direction": "ingress", "remote_ip_prefix": "::/0", "protocol": "47", "ethertype": "IPv6", "port_range_max": 65535, "port_range_min": 1} + - {"direction": "ingress", "remote_ip_prefix": "::/0", "protocol": "icmp", "ethertype": "IPv6"} + +# vSON Cluster Manager + vson_clm_0: + type: nested_vson_server.yaml + depends_on: [vson_clm_server_group, oam_net_security_group] + properties: + instance_index: 0 + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vfc_role: clm + vson_server_group_id: {get_resource: vson_clm_server_group} + oam_net_id: {get_param: oam_net_id} + oam_net_subnet_prefix_length: {get_param: oam_net_subnet_prefix_length} + default_gateway: {get_param: default_gateway} + dns_servers: {get_param: dns_servers} + ntp_servers: {get_param: ntp_servers} + oam_net_security_group_id: {get_resource: oam_net_security_group} + availability_zones: [{get_param: availability_zone_0}] + vson_vm_names: [{get_param: vson_clm_name_0}] + oam_net_ips: [{get_param: vson_clm_oam_net_ip_0}] + vson_vm_flavor_name: {get_param: vson_clm_flavor_name} + vson_vm_image_name: {get_param: vson_clm_image_name} + vson_clm_oam_net_ip: {get_param: vson_master_clm_ip} + vson_cluster_name: {get_param: vson_cluster_name} + swift_storage_url: {get_param: swift_storage_url} + swift_account_auth_token: {get_param: swift_account_auth_token} + swift_son_container_name: {get_param: swift_son_container_name} + +outputs: + + oam_net_security_group_id: + value: {get_resource: oam_net_security_group} + description: ID of the OAM network Security group + + vson_clm_server_group_id: + value: {get_resource: vson_clm_server_group} + description: ID of the Server Group intended for vSON Cluster Management instances. + + vson_leader_server_group_id: + value: {get_resource: vson_leader_server_group} + description: ID of the Server Group intended for vSON Cluster/DC leaders. + + vson_dbc_server_group_id: + value: {get_resource: vson_dbc_server_group} + description: ID of the Server Group intended for vSON DBC instances. + + vson_dbg_server_group_id: + value: {get_resource: vson_dbg_server_group} + description: ID of the Server Group intended for vSON DBG instances. + + vson_dbs_server_group_id: + value: {get_resource: vson_dbs_server_group} + description: ID of the Server Group intended for vSON DBS instances. + + vson_mon_server_group_id: + value: {get_resource: vson_mon_server_group} + description: ID of the Server Group intended for vSON MON instances. + + vson_mgt_server_group_id: + value: {get_resource: vson_mgt_server_group} + description: ID of the Server Group intended for vSON Management instances. + + vson_mdr_server_group_id: + value: {get_resource: vson_mdr_server_group} + description: ID of the Server Group intended for vSON Mediator instances. + + vson_app_server_group_id: + value: {get_resource: vson_app_server_group} + description: ID of the Server Group intended for vSON Application instances. + + vson_clm_0_oam_net_ip_0: + value: {get_param: vson_clm_oam_net_ip_0} + description: vSON Cluster Management server IP on the OAM network. + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/deploy.sh b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/deploy.sh new file mode 100644 index 0000000000..dc506d50e2 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/deploy.sh @@ -0,0 +1,317 @@ +#!/bin/bash +##################################################### +# In case a volume should be attached to the instance +# 1) partitioning cinder volume +# 2) creating XFS on the volume +# 3) labeling the volume +# 4) mounting the volume +# 5) adding appropriate entry to the /etc/fstab file +##################################################### +# Configure Salt-minion +##################################################### +# Deploy ,provision and configure vSON components +##################################################### +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +##################################################### +# METADATA +# Should be modified in case the version has changed +CLM_PKG_VERSION=1.0 +##################################################### +DEBUG_LOG=/tmp/minion_debug-$$.log +vfc_role=$HOT_VFC_ROLE +this_instance_index=$HOT_INSTANCE_INDEX +IPv4="inet" +IPv6="inet6" +IP_INVALID="invalid" + +failure() +{ + local msg=$1 + local signal=$2 + + $HOT_WC_NOTIFY -H "X-Auth-Token: $HOT_SWIFT_AUTH_TOKEN" --data-binary "{\"status\": \"FAILURE\", \"reason\": \"$signal\", \"data\": \"$msg\"}" + exit $signal +} + +_get_ip_family() +{ + local ip=$1 + local ip_family=$(python -c " + +import socket + +family = \"$IPv4\" +try: + socket.inet_pton(socket.AF_INET, \"$ip\") +except: + family = \"$IPv6\" + try: + socket.inet_pton(socket.AF_INET6, \"$ip\") + except: + family = \"$IP_INVALID\" +print family") + + [ "$ip_family" == "$IP_INVALID" ] && failure "Invalid IP $ip." 100 + echo $ip_family +} + +_volume_persist_config_intucell() +{ + mkdir -p /intucell + mount -L INTUCELL /intucell + chown intucell:intucell /intucell + echo "LABEL=INTUCELL /intucell xfs rw,noatime,attr2,noquota 0 2" >> /etc/fstab +} + +set_static_ip() +{ + local ip=$1 + local prefix_length=$2 + local interface=$3 + local ip_family=$4 + local gw=$5 + + local netmask=$prefix_length + + if [ "$ip_family" == "$IPv4" ];then + netmask=$(python -c " + +import struct +import socket +print socket.inet_ntoa(struct.pack('>L', (1<<32) - (1<<32>>$prefix_length)))" +) + fi + + if grep manual /etc/network/interfaces.d/$interface;then + echo "auto $interface" > /etc/network/interfaces.d/$interface + fi + cat << EOF >> /etc/network/interfaces.d/$interface +iface $interface $ip_family static + address $ip + netmask $netmask +EOF + + if [ "X$gw" != "X" ];then + echo " gateway $gw" >> /etc/network/interfaces.d/$interface + fi + + ifdown $interface --force || true + ifup $interface +} + +set_dns_servers() +{ + + for dns in $(echo $HOT_DNS_SERVERS|tr ',' ' ');do + if [ "X$dns" != "X" ];then + echo "nameserver $dns" >> /etc/resolv.conf + fi + done +} + +set_ntp_servers() +{ + cat << EOF > /etc/systemd/timesyncd.conf +[Time] +Servers=$HOT_NTP_SERVERS +EOF +} + +dns_lookup() +{ + server_ip=$1 + + host $server_ip + (( $? == 0 )) || return 1 +} + +volume_main() +{ + set -e + + if $(blkid -L INTUCELL &> /dev/null);then + _volume_persist_config_intucell + mount -a + return + fi + + volume_id=$HOT_VOLUME_ID + + disk_id=${volume_id:0:20} + for device in /dev/disk/by-id/*;do + [[ $device =~ part ]] && continue + id=${device##*/virtio-} + id=${id:0:20} + if [[ "$id" == "$disk_id" ]];then + (echo o; echo n; echo p; echo 1; echo; echo; echo w;) | fdisk $device + partition=${device}-part1 + while true;do + partprobe + sleep 2 + [[ -L ${device}-part1 ]] && break + done + mkfs.xfs -f -L INTUCELL ${device}-part1 + _volume_persist_config_intucell + mount -a + fi + done + + set +e +} + +init_main() +{ + local ip_family=$1 + + ## SaltStack minion configuration + if [ -z "$HOT_CLM_SERVER_IP" ];then + clm_primary=1 + clm_server_ip=$HOT_THIS_INSTANCE_OAM_NET_IP + else + clm_server_ip=$HOT_CLM_SERVER_IP + fi + + minion_conf=/etc/salt/minion.d/vson-minion.conf + + cat << EOF > $minion_conf +environment: prod +hash_type: sha256 +mine_interval: 5 + +EOF + [ "$ip_family" == "$IPv6" ] && echo "ipv6: True" >> $minion_conf + host $clm_server_ip + if (($? != 0 ));then + echo "$clm_server_ip clm0" >> /etc/hosts + clm_server_ip=clm0 + fi + + if (( $clm_primary ));then + cat << EOF >> $minion_conf +file_roots: + prod: + - /srv/cisco/salt/prod + +pillar_roots: + prod: + - /srv/cisco/pillar/prod + +EOF + fi + + cat << EOF > /etc/salt/minion.d/vson-minion-mc.conf +master: + - $clm_server_ip +EOF + + minion_grains_conf=/etc/salt/grains + cat << EOF > $minion_grains_conf +vson.environment: prod +vson.vfc_role: $vfc_role +vson.this_vfc_instance_index: $this_instance_index +EOF + + if [ -n "$HOT_DC_NAME" ];then + echo "vson.dc_name: $HOT_DC_NAME" >> $minion_grains_conf + fi + if [ -n "$HOT_CLUSTER_NAME" ];then + echo "vson.cluster_name: $HOT_CLUSTER_NAME" >> $minion_grains_conf + fi + if [ -n "$HOT_VSON_JOIN_CLUSTER_AUTH_TOKEN" ];then + echo "vson.join_cluster_auth_token: $HOT_VSON_JOIN_CLUSTER_AUTH_TOKEN" >> $minion_grains_conf + fi + if [ -n "$HOT_SWIFT_CONTAINER_NAME" ];then + echo "swift.container_name: $HOT_SWIFT_CONTAINER_NAME" >> $minion_grains_conf + fi + if [ -n "$HOT_SWIFT_STORAGE_URL" ];then + echo "swift.storage_url: $HOT_SWIFT_STORAGE_URL" >> $minion_grains_conf + fi + if [ -n "$HOT_SWIFT_AUTH_TOKEN" ];then + echo "swift.auth_token: $HOT_SWIFT_AUTH_TOKEN" >> $minion_grains_conf + fi + + cat << EOF > /etc/salt/minion.d/vson-minion-mc.conf +master: + - $clm_server_ip +EOF + +# Remove old minion_id file + rm -f /etc/salt/minion_id + rm -rf /var/cache/salt/minion/* +# Start Salt minion service + systemctl start salt-minion +# Enable Salt minion service + systemctl enable salt-minion + sleep 5 +} + +clm_main() +{ + + cd /srv; curl -s -H "X-Auth-Token: $HOT_SWIFT_AUTH_TOKEN" $HOT_SWIFT_STORAGE_URL/$HOT_SWIFT_CONTAINER_NAME/vson-clm-${CLM_PKG_VERSION}.tar| tar xv + + if (( $clm_primary ));then + salt-call --local state.apply vson.deploy -l debug --log-file-level=debug --log-file=$DEBUG_LOG + else + salt-call state.apply vson.deploy -l debug --log-file-level=debug --log-file=$DEBUG_LOG + salt-call state.apply vson.fire_events.reconfigure_minions -l debug --log-file-level=debug --log-file=$DEBUG_LOG + fi + if grep "ERROR" $DEBUG_LOG;then + return 1 + fi +} + +vfc_main() +{ + salt-call saltutil.sync_all + salt-call state.apply vson.deploy -l debug --log-file-level=debug --log-file=$DEBUG_LOG + if [ "$vfc_role" == "mon" ];then + salt-call state.apply vson.vfc-mon.fire_events.configure_multisite -l debug --log-file-level=debug --log-file=$DEBUG_LOG + fi + if grep "ERROR" $DEBUG_LOG;then + return 1 + fi +} + +###### For testing only ####### +echo -e "cisco\ncisco"|passwd +sed -i "s#\(PermitRootLogin\) without-password#\1 yes#" /etc/ssh/sshd_config +systemctl restart ssh +############################### + +echo "LANG=en_US.utf-8" > /etc/environment +echo "LC_ALL=en_US.utf-8" >> /etc/environment +touch /var/lib/cloud/instance/locale-check.skip + +rm -rf /etc/apt/sources.list.d/* + +## Let rsyslog reread new name of the instance +systemctl restart rsyslog + +set_static_ip "$HOT_THIS_INSTANCE_OAM_NET_IP" "$HOT_THIS_INSTANCE_OAM_NET_PREFIX" "eth0" $(_get_ip_family $HOT_THIS_INSTANCE_OAM_NET_IP) $HOT_THIS_INSTANCE_DEFAULT_GATEWAY +if [ "X$HOT_THIS_INSTANCE_OAM_V6_NET_IP" != "X" ];then + set_static_ip "$HOT_THIS_INSTANCE_OAM_V6_NET_IP" "$HOT_THIS_INSTANCE_OAM_V6_NET_PREFIX" "eth0" $(_get_ip_family $HOT_THIS_INSTANCE_OAM_V6_NET_IP) +fi + +set_dns_servers +set_ntp_servers +systemctl restart systemd-timesyncd + +if [ "$HOT_VOLUME_ATTACH" == "True" ];then + volume_main || failure "Cinder volume configuration." 110 +fi + +init_main $IPv4 || failure "VFC initial configuration" 120 + +if [ "$vfc_role" == "clm" ];then + clm_main || failure "vSON CLM deployment." 130 +else + mkdir /intucell + chown -R intucell:intucell /intucell + vfc_main || failure "vSON $vfc_role deployment." 140 +fi + + $HOT_WC_NOTIFY -H "X-Auth-Token: $HOT_SWIFT_AUTH_TOKEN" --data-binary '{"status": "SUCCESS"}' + rm -f $DEBUG_LOG + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_0_vson_mgt.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_0_vson_mgt.env new file mode 100644 index 0000000000..0041d69109 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_0_vson_mgt.env @@ -0,0 +1,68 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique ID for this VF instance. +# vnf_id: 0 + +## Unique name for this VF module instance. +# vf_module_name: module_0_vson_mgt + +## Unique ID for this VF Module instance. +# vf_module_id: 0 + +## The ID of the OAM network. +# oam_net_id: e74c21d6-9d47-4620-9594-7e440b4302b0 + +## Address length prefix for the subnet on the OAM network +# oam_net_subnet_prefix_length: 24 + +## Default gateway.Required for the Sandbox environment. +# default_gateway: 10.56.124.1 + +## List of DNS servers +# dns_servers: 64.102.6.247 + +## List of NTP servers +# ntp_servers: 173.38.201.67 + +## Availability zone. +## NOTE: vSON MGT instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_0: nova + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group intended for vSON MGT. +# vson_mgt_server_group_id: fb166e35-7006-49c9-b914-6c11d2082568 + +## The ID of Security group applied on the port +## bound to the vSON OAM network. +# oam_net_security_group_id: 42e187a1-45cc-4a99-993b-40a42a5cb081 + +## ID of the volume intended for the vSON Management server. +# vson_mgt_volume_id_0: 4c0e5552-ff7d-44eb-90d1-7b7741751a77 + +## Unique name for the vSON Management server. + vson_mgt_name_0: vson-03.cisco.com + +## The ID or name of the Management flavor. + vson_mgt_flavor_name: vson-mgt-flavor + +## Fixed IP assignment for the vSON MGT instance on the OAM network. +# vson_mgt_oam_net_ip_0: 10.56.124.12 + +## IP of the first vSON Cluster Management server. +# vson_clm_0_oam_net_ip_0: 10.56.124.10 + +## Name of the vSON Data Center. +# vson_dc_unit: DC1 + +## Swift account auth token. +## Example: 041a5187bb4641f9b89583e2539776b0 +# swift_account_auth_token: 35a7c0fcc45f48988433834e4d88638c + +## Number of vSON Management servers. +# number_of_servers: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_0_vson_mgt.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_0_vson_mgt.yaml new file mode 100644 index 0000000000..157d5a804c --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_0_vson_mgt.yaml @@ -0,0 +1,151 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: The template deploys vSON VFC of type MGT. + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance. + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: OAM network subnet prefix length. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + availability_zone_0: + type: string + label: Availability zone 0 + description: Availability zone. + + vson_mgt_server_group_id: + type: string + label: vSON Management server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON Management instances. + + vson_mgt_volume_id_0: + type: string + label: vSON Management Volume ID 0 + description: Volume ID of the vSON Management server. + + vson_mgt_name_0: + type: string + label: vSON Management instance name + description: Unique name to be issued to the vSON Management instance. + + vson_mgt_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_mgt_oam_net_ip_0: + type: string + label: vSON MGT OAM network IP address + description: Fixed IP assignment for the vSON MGT instance on the OAM network. + + vson_clm_0_oam_net_ip_0: + type: string + label: vSON Cluster Manager 0 OAM net IP + description: IP of the first vSON Cluster Management server. + + vson_dc_unit: + type: string + label: vSON Datacenter name + description: vSON Datacenter name. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + + number_of_servers: + type: number + label: Number of Servers + description: Number of vSON Management servers. + constraints: + - range: { min: 1, max: 1} + +resources: + + vson_mgt_group: + type: OS::Heat::ResourceGroup + properties: + count: {get_param: number_of_servers} + resource_def: + type: nested_vson_server_from_vol.yaml + properties: + instance_index: "%index%" + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vfc_role: mgt + oam_net_id: {get_param: oam_net_id} + oam_net_subnet_prefix_length: {get_param: oam_net_subnet_prefix_length} + default_gateway: {get_param: default_gateway} + dns_servers: {get_param: dns_servers} + ntp_servers: {get_param: ntp_servers} + oam_net_security_group_id: {get_param: oam_net_security_group_id} + availability_zones: [{get_param: availability_zone_0}] + vson_server_group_id: {get_param: vson_mgt_server_group_id} + volume_ids: [{get_param: vson_mgt_volume_id_0}] + vson_vm_names: [{get_param: vson_mgt_name_0}] + oam_net_ips: [{get_param: vson_mgt_oam_net_ip_0}] + vson_vm_flavor_name: {get_param: vson_mgt_flavor_name} + vson_clm_oam_net_ip: {get_param: vson_clm_0_oam_net_ip_0} + vson_dc_unit: {get_param: vson_dc_unit} + swift_account_auth_token: {get_param: swift_account_auth_token} + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_0_vson_mgt_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_0_vson_mgt_volume.env new file mode 100644 index 0000000000..602d5f56c6 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_0_vson_mgt_volume.env @@ -0,0 +1,21 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique name for this VF module instance. + vf_module_name: module_0_vson_mgt_volume + +## Base VM Image name the instance will be created from. + vson_mgt_image_name: VSON-BASE-1.0 + +## Availability zone for the vSON Management Cinder volume. +# availability_zone_0: nova + +## Volume name + vson_mgt_volume_name_0: vson_mgt_volume_0 + +## Size of the volume.Measured in gigabytes. +## Default: 100 + vson_mgt_volume_size_0: 100 + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_0_vson_mgt_volume.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_0_vson_mgt_volume.yaml new file mode 100644 index 0000000000..46d7785dcf --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_0_vson_mgt_volume.yaml @@ -0,0 +1,69 @@ +heat_template_version: 2014-10-16 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: > + Create a Cinder volume. + Cinder volume is a storage in the form of block devices. + It can be used, for example, for providing storage to instance. + Volume supports creation from snapshot, backup or image. + Also volume can be created only by size. + The template creates volume for vSON Management server + (Virtual Function Component MGT). + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + availability_zone_0: + type: string + label: Availability zone 0 + description: Availability zone. + + vson_mgt_volume_name_0: + type: string + label: vSON MGT volume name + description: Volume name. + + vson_mgt_volume_size_0: + type: number + label: vSON MGT cinder volume size + description: Size of the Cinder volume. Measured in gigabytes. + + vson_mgt_image_name: + type: string + label: vSON Management VM image name + description: Image name the volume will be created from. + +resources: + + vson_mgt_volume_0: + type: OS::Cinder::Volume + properties: + name: {get_param: vson_mgt_volume_name_0} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_0} + size: {get_param: vson_mgt_volume_size_0} + image: {get_param: vson_mgt_image_name} + description: > + vSON MGT cinder volume. + The volume is created from the vSON base VM image. + +outputs: + + vson_mgt_volume_id_0: + value: {get_resource: vson_mgt_volume_0} + description: ID of the vSON Management volume. + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_1_vson_mon.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_1_vson_mon.env new file mode 100644 index 0000000000..a271b1de96 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_1_vson_mon.env @@ -0,0 +1,68 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique ID for this VF instance. +# vnf_id: 0 + +## Unique name for this VF module instance. +# vf_module_name: module_1_vson_mon + +## Unique ID for this VF Module instance. +# vf_module_id: 1 + +## The ID of the OAM network. +# oam_net_id: e74c21d6-9d47-4620-9594-7e440b4302b0 + +## Address length prefix for the subnet on the OAM network +# oam_net_subnet_prefix_length: 24 + +## Default gateway.Required for the Sandbox environment. +# default_gateway: 10.56.124.1 + +## List of DNS servers +# dns_servers: 64.102.6.247 + +## List of NTP servers +# ntp_servers: 173.38.201.67 + +## Availability zone. +## NOTE: vSON MON instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_0: nova + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group intended for vSON MON. +# vson_mon_server_group_id: f62e69f5-6d33-4464-b474-d4969cdf285e + +## The ID of Security group applied on the port +## bound to the vSON OAM network. +# oam_net_security_group_id: 42e187a1-45cc-4a99-993b-40a42a5cb081 + +## ID of the volume intended for the vSON MON server. +# vson_mon_volume_id_0: 689419ee-269d-4493-a429-5d065d7f0607 + +## Unique name for the vSON MON server. +# vson_mon_name_0: vson-04.cisco.com + +## The ID or name of the MON flavor. +# vson_mon_flavor_name: vson-mon-flavor + +## Fixed IP assignment for the vSON MON instance on the OAM network. +# vson_mon_oam_net_ip_0: 10.56.124.13 + +## IP of the first vSON Cluster Management server. +# vson_clm_0_oam_net_ip_0: 10.56.124.10 + +## Name of the vSON Data Center. +# vson_dc_unit: DC1 + +## Swift account auth token. +## Example: 041a5187bb4641f9b89583e2539776b0 +# swift_account_auth_token: 35a7c0fcc45f48988433834e4d88638c + +## Number of vSON MON servers. +# number_of_servers: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_1_vson_mon.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_1_vson_mon.yaml new file mode 100644 index 0000000000..82673c3a42 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_1_vson_mon.yaml @@ -0,0 +1,151 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: The template deploys vSON VFC of type MON. + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance. + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: OAM network subnet prefix length. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + availability_zone_0: + type: string + label: Availability zone 0 + description: Availability zone. + + vson_mon_server_group_id: + type: string + label: vSON MON server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON MON instances. + + vson_mon_volume_id_0: + type: string + label: vSON MON Volume ID 0 + description: Volume ID of the vSON MON server. + + vson_mon_name_0: + type: string + label: vSON MON instance name + description: Unique name to be issued to the vSON MON instance. + + vson_mon_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_mon_oam_net_ip_0: + type: string + label: vSON MON OAM network IP address + description: Fixed IP assignment for the vSON MON instance on the OAM network. + + vson_clm_0_oam_net_ip_0: + type: string + label: vSON Cluster Manager 0 OAM net IP + description: IP of the first vSON Cluster Management server. + + vson_dc_unit: + type: string + label: vSON Datacenter name + description: vSON Datacenter name. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + + number_of_servers: + type: number + label: Number of Servers + description: Number of vSON MON servers. + constraints: + - range: { min: 1, max: 1} + +resources: + + vson_mon_group: + type: OS::Heat::ResourceGroup + properties: + count: {get_param: number_of_servers} + resource_def: + type: nested_vson_server_from_vol.yaml + properties: + instance_index: "%index%" + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vfc_role: mon + oam_net_id: {get_param: oam_net_id} + oam_net_subnet_prefix_length: {get_param: oam_net_subnet_prefix_length} + default_gateway: {get_param: default_gateway} + dns_servers: {get_param: dns_servers} + ntp_servers: {get_param: ntp_servers} + oam_net_security_group_id: {get_param: oam_net_security_group_id} + availability_zones: [{get_param: availability_zone_0}] + vson_server_group_id: {get_param: vson_mon_server_group_id} + volume_ids: [{get_param: vson_mon_volume_id_0}] + vson_vm_names: [{get_param: vson_mon_name_0}] + oam_net_ips: [{get_param: vson_mon_oam_net_ip_0}] + vson_vm_flavor_name: {get_param: vson_mon_flavor_name} + vson_clm_oam_net_ip: {get_param: vson_clm_0_oam_net_ip_0} + vson_dc_unit: {get_param: vson_dc_unit} + swift_account_auth_token: {get_param: swift_account_auth_token} + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_1_vson_mon_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_1_vson_mon_volume.env new file mode 100644 index 0000000000..f250c57ed1 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_1_vson_mon_volume.env @@ -0,0 +1,21 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique name for this VF module instance. +# vf_module_name: module_1_vson_mon_volume + +## Base VM Image name the instance will be created from. + vson_mon_image_name: VSON-BASE-1.0 + +## Availability zone for the vSON MON Cinder volume. +# availability_zone_0: nova + +## Volume name + vson_mon_volume_name_0: vson_mon_volume_0 + +## Size of the volume.Measured in gigabytes. +## Default: 100 + vson_mon_volume_size_0: 100 + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_1_vson_mon_volume.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_1_vson_mon_volume.yaml new file mode 100644 index 0000000000..f74d55922d --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_1_vson_mon_volume.yaml @@ -0,0 +1,69 @@ +heat_template_version: 2014-10-16 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: > + Create a Cinder volume. + Cinder volume is a storage in the form of block devices. + It can be used, for example, for providing storage to instance. + Volume supports creation from snapshot, backup or image. + Also volume can be created only by size. + The template creates volume for vSON Monitor and KPIs routing server + (Virtual Function Component MON). + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + availability_zone_0: + type: string + label: Availability zone 0 + description: Availability zone. + + vson_mon_volume_name_0: + type: string + label: vSON MON volume name + description: Volume name. + + vson_mon_volume_size_0: + type: number + label: vSON MON cinder volume size + description: Size of the Cinder volume. Measured in gigabytes. + + vson_mon_image_name: + type: string + label: vSON MON VM image name + description: Image name the volume will be created from. + +resources: + + vson_mon_volume_0: + type: OS::Cinder::Volume + properties: + name: {get_param: vson_mon_volume_name_0} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_0} + size: {get_param: vson_mon_volume_size_0} + image: {get_param: vson_mon_image_name} + description: > + vSON MON cinder volume. + The volume is created from the vSON base VM image. + +outputs: + + vson_mon_volume_id_0: + value: {get_resource: vson_mon_volume_0} + description: ID of the vSON Monitor and KPIs routing volume. + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_2_vson_mdr.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_2_vson_mdr.env new file mode 100644 index 0000000000..884a5b82ab --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_2_vson_mdr.env @@ -0,0 +1,68 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique ID for this VF instance. +# vnf_id: 0 + +## Unique name for this VF module instance. +# vf_module_name: module_2_vson_mdr + +## Unique ID for this VF Module instance. +# vf_module_id: 2 + +## The ID of the OAM network. +# oam_net_id: e74c21d6-9d47-4620-9594-7e440b4302b0 + +## Address length prefix for the subnet on the OAM network +# oam_net_subnet_prefix_length: 24 + +## Default gateway.Required for the Sandbox environment. +# default_gateway: 10.56.124.1 + +## List of DNS servers +# dns_servers: 64.102.6.247 + +## List of NTP servers +# ntp_servers: 173.38.201.67 + +## Availability zone. +## NOTE: vSON MDR instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_0: nova + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group intended for vSON MDR. +# vson_mdr_server_group_id: 072b4591-e90f-4aee-a1d5-5755d509db21 + +## The ID of Security group applied on the port +## bound to the vSON OAM network. +# oam_net_security_group_id: 42e187a1-45cc-4a99-993b-40a42a5cb081 + +## ID of the volume intended for the vSON Mediator server. +# vson_mdr_volume_id_0: 3751e62e-dd9d-457a-9df0-c4c6126091ed + +## Unique name for the vSON Mediator server. +# vson_mdr_name_0: vson-05.cisco.com + +## The ID or name of the Mediator flavor. + vson_mdr_flavor_name: vson-mdr-flavor + +## Fixed IP assignment for the vSON MDR instance on the OAM network. +# vson_mdr_oam_net_ip_0: 10.56.124.14 + +## IP of the first vSON Cluster Management server. +# vson_clm_0_oam_net_ip_0: 10.56.124.10 + +## Name of the vSON Data Center. +# vson_dc_unit: DC1 + +## Swift account auth token. +## Example: 041a5187bb4641f9b89583e2539776b0 +# swift_account_auth_token: 35a7c0fcc45f48988433834e4d88638c + +## Number of vSON Mediator servers. +# number_of_servers: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_2_vson_mdr.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_2_vson_mdr.yaml new file mode 100644 index 0000000000..d9cea26b4c --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_2_vson_mdr.yaml @@ -0,0 +1,151 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: The template deploys vSON VFC of type Mediator (MDR). + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance. + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: OAM network subnet prefix length. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + availability_zone_0: + type: string + label: Availability zone 0 + description: Availability zone. + + vson_mdr_server_group_id: + type: string + label: vSON Mediator server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON Mediator instances. + + vson_mdr_volume_id_0: + type: string + label: vSON Mediator Volume ID 0 + description: Volume ID of the vSON Mediator server. + + vson_mdr_name_0: + type: string + label: vSON Mediator instance name + description: Unique name to be issued to the vSON Mediator instance. + + vson_mdr_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_mdr_oam_net_ip_0: + type: string + label: vSON MDR OAM network IP address + description: Fixed IP assignment for the vSON MDR instance on the OAM network. + + vson_clm_0_oam_net_ip_0: + type: string + label: vSON Cluster Manager 0 OAM net IP + description: IP of the first vSON Cluster Management server. + + vson_dc_unit: + type: string + label: vSON Datacenter name + description: vSON Datacenter name. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + + number_of_servers: + type: number + label: Number of Servers + description: Number of vSON Mediator servers. + constraints: + - range: { min: 1, max: 1} + +resources: + + vson_mdr_group: + type: OS::Heat::ResourceGroup + properties: + count: {get_param: number_of_servers} + resource_def: + type: nested_vson_server_from_vol.yaml + properties: + instance_index: "%index%" + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vfc_role: mdr + oam_net_id: {get_param: oam_net_id} + oam_net_subnet_prefix_length: {get_param: oam_net_subnet_prefix_length} + default_gateway: {get_param: default_gateway} + dns_servers: {get_param: dns_servers} + ntp_servers: {get_param: ntp_servers} + oam_net_security_group_id: {get_param: oam_net_security_group_id} + availability_zones: [{get_param: availability_zone_0}] + vson_server_group_id: {get_param: vson_mdr_server_group_id} + volume_ids: [{get_param: vson_mdr_volume_id_0}] + vson_vm_names: [{get_param: vson_mdr_name_0}] + oam_net_ips: [{get_param: vson_mdr_oam_net_ip_0}] + vson_vm_flavor_name: {get_param: vson_mdr_flavor_name} + vson_clm_oam_net_ip: {get_param: vson_clm_0_oam_net_ip_0} + vson_dc_unit: {get_param: vson_dc_unit} + swift_account_auth_token: {get_param: swift_account_auth_token} + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_2_vson_mdr_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_2_vson_mdr_volume.env new file mode 100644 index 0000000000..794b9dcf7c --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_2_vson_mdr_volume.env @@ -0,0 +1,21 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique name for this VF module instance. +# vf_module_name: module_2_vson_mdr_volume + +## Base VM Image name the instance will be created from. +# vson_mdr_image_name: VSON-BASE-1.0 + +## Availability zone for the vSON Management Cinder volume. +# availability_zone_0: nova + +## Volume name + vson_mdr_volume_name_0: vson_mdr_volume_0 + +## Size of the volume.Measured in gigabytes. +## Default: 50 + vson_mdr_volume_size_0: 50 + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_2_vson_mdr_volume.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_2_vson_mdr_volume.yaml new file mode 100644 index 0000000000..1652765273 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_2_vson_mdr_volume.yaml @@ -0,0 +1,69 @@ +heat_template_version: 2014-10-16 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: > + Create a Cinder volume. + Cinder volume is a storage in the form of block devices. + It can be used, for example, for providing storage to instance. + Volume supports creation from snapshot, backup or image. + Also volume can be created only by size. + The template creates volume for vSON Mediator server + (Virtual Function Component MDR). + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + availability_zone_0: + type: string + label: Availability zone 0 + description: Availability zone. + + vson_mdr_volume_name_0: + type: string + label: vSON MGT volume name + description: Volume name. + + vson_mdr_volume_size_0: + type: number + label: vSON MDR cinder volume size + description: Size of the Cinder volume. Measured in gigabytes. + + vson_mdr_image_name: + type: string + label: vSON Mediator VM image name + description: Image name the volume will be created from. + +resources: + + vson_mdr_volume_0: + type: OS::Cinder::Volume + properties: + name: {get_param: vson_mdr_volume_name_0} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_0} + size: {get_param: vson_mdr_volume_size_0} + image: {get_param: vson_mdr_image_name} + description: > + vSON MDR cinder volume. + The volume is created from the vSON base VM image. + +outputs: + + vson_mdr_volume_id_0: + value: {get_resource: vson_mdr_volume_0} + description: Volume ID. + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_3_vson_cll.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_3_vson_cll.env new file mode 100644 index 0000000000..4dd17cfe14 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_3_vson_cll.env @@ -0,0 +1,94 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique ID for this VF instance. +# vnf_id: 0 + +## Unique name for this VF module instance. +# vf_module_name: module_3_vson_cll + +## Unique ID for this VF Module instance. +# vf_module_id: 3 + +## The ID of the OAM network. +# oam_net_id: e74c21d6-9d47-4620-9594-7e440b4302b0 + +## Address length prefix for the subnet on the OAM network +# oam_net_subnet_prefix_length: 24 + +## Default gateway.Required for Sandbox. +# default_gateway: 10.56.124.1 + +## List of DNS servers +# dns_servers: 64.102.6.247 + +## List of NTP servers +# ntp_servers: 173.38.201.67 + +## First availability zone for vSON Cluster leaders. +## NOTE: vSON Cluster leader instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_0: nova + +## Second availability zone for vSON Cluster leaders. +## NOTE: vSON Cluster leader instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_1: nova + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group intended for vSON Cluster leaders. +# vson_leader_server_group_id: 138c78ff-3552-4ee7-ad9d-a5b78427bdd0 + +## The ID of Security group applied on the port +## bound to the vSON OAM network. +# oam_net_security_group_id: 42e187a1-45cc-4a99-993b-40a42a5cb081 + +## ID of the volume intended for the first vSON Cluster leader. +# vson_cll_volume_id_0: 0378cf0f-5347-4227-9943-d3a5cabfec71 + +## ID of the volume intended for the second vSON Cluster leader. +# vson_cll_volume_id_1: ae45781e-11ee-4b92-99ce-ca166ee2a5a9 + +## ID of the volume intended for the third vSON Cluster leader. +# vson_cll_volume_id_2: 395c46e2-8230-4d0d-9a08-6bca9f80b716 + +## Unique name for the first vSON Cluster leader. +# vson_cll_name_0: vson-06.cisco.com + +## Unique name for the second vSON Cluster leader. +# vson_cll_name_1: vson-07.cisco.com + +## Unique name for the third vSON Cluster leader. +# vson_cll_name_2: vson-08.cisco.com + +## VM Image name a vSON Cluster leader instance will be created from. +# vson_cll_image_name: VSON-BASE-1.0 + +## The ID or name of the Cluster leader flavor. +# vson_cll_flavor_name: vson-cll-flavor + +## Fixed IP assignment for the first vSON Cluster leader instance on the OAM network. +# vson_cll_oam_net_ip_0: 10.56.124.15 + +## Fixed IP assignment for the second vSON Cluster leader instance on the OAM network. +# vson_cll_oam_net_ip_1: 10.56.124.16 + + ## Fixed IP assignment for the third vSON Cluster leader instance on the OAM network. +# vson_cll_oam_net_ip_2: 10.56.124.17 + +## IP of the first vSON Cluster Management server. +# vson_clm_0_oam_net_ip_0: 10.56.124.10 + +## Name of the vSON Data Center. +# vson_dc_unit: DC1 + +## Swift account auth token. +## Example: 041a5187bb4641f9b89583e2539776b0 +# swift_account_auth_token: 35a7c0fcc45f48988433834e4d88638c + +## Number of vSON Cluster leaders. +# number_of_servers: 3 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_3_vson_cll.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_3_vson_cll.yaml new file mode 100644 index 0000000000..61601342bc --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_3_vson_cll.yaml @@ -0,0 +1,195 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: > + The template deploys three instances of vSON Cluster leaders, + instantiates cluster and the first Datacenter. + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance. + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: OAM network subnet prefix length. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + availability_zone_0: + type: string + label: Availability zone 0 + description: First availability zone. + + availability_zone_1: + type: string + label: Availability zone 1 + description: Second availability zone. + + vson_leader_server_group_id: + type: string + label: vSON Cluster leader server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON Cluster leaders. + + vson_cll_volume_id_0: + type: string + label: vSON Cluster Leader Volume ID 0 + description: Volume ID of the first vSON Cluster leader. + + vson_cll_volume_id_1: + type: string + label: vSON Cluster Leader Volume ID 1 + description: Volume ID of the second vSON Cluster leader. + + vson_cll_volume_id_2: + type: string + label: vSON Cluster Leader Volume ID 2 + description: Volume ID of the third vSON Cluster leader. + + vson_cll_name_0: + type: string + label: First vSON Cluster leader name + description: Unique name to be issued to the first vSON Cluster leader. + + vson_cll_name_1: + type: string + label: Second vSON Cluster leader name + description: Unique name to be issued to the second vSON Cluster leader. + + vson_cll_name_2: + type: string + label: Third vSON Cluster leader name + description: Unique name to be issued to the third vSON Cluster leader. + + vson_cll_image_name: + type: string + label: vSON base VM image name + description: VM Image name the vSON Cluster leader instance will be created from. + + vson_cll_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_cll_oam_net_ip_0: + type: string + label: vSON Cluster leader OAM network IP address 0 + description: Fixed IP assignment for the first vSON Cluster leader instance on the OAM network. + + vson_cll_oam_net_ip_1: + type: string + label: vSON Cluster leader OAM network IP address 1 + description: Fixed IP assignment for the second vSON Cluster leader instance on the OAM network. + + vson_cll_oam_net_ip_2: + type: string + label: vSON Cluster leader OAM network IP address 2 + description: Fixed IP assignment for the third vSON Cluster leader instance on the OAM network. + + vson_dc_unit: + type: string + label: vSON Datacenter name + description: vSON Datacenter name. + + vson_clm_0_oam_net_ip_0: + type: string + label: vSON Cluster Manager 0 OAM net IP + description: IP of the first vSON Cluster Management server. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + + number_of_servers: + type: number + label: Number of Servers + description: Number of vSON Cluster leaders. + constraints: + - range: { min: 1, max: 3} + +resources: + + vson_cll_group: + type: OS::Heat::ResourceGroup + properties: + count: {get_param: number_of_servers} + resource_def: + type: nested_vson_server_with_vol.yaml + properties: + instance_index: "%index%" + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vfc_role: cll + oam_net_id: {get_param: oam_net_id} + oam_net_subnet_prefix_length: {get_param: oam_net_subnet_prefix_length} + default_gateway: {get_param: default_gateway} + dns_servers: {get_param: dns_servers} + ntp_servers: {get_param: ntp_servers} + oam_net_security_group_id: {get_param: oam_net_security_group_id} + availability_zones: [{get_param: availability_zone_0}, {get_param: availability_zone_1}, {get_param: availability_zone_0}] + vson_server_group_id: {get_param: vson_leader_server_group_id} + volume_ids: [{get_param: vson_cll_volume_id_0}, {get_param: vson_cll_volume_id_1}, {get_param: vson_cll_volume_id_2}] + vson_vm_names: [{get_param: vson_cll_name_0}, {get_param: vson_cll_name_1}, {get_param: vson_cll_name_2}] + oam_net_ips: [{get_param: vson_cll_oam_net_ip_0}, {get_param: vson_cll_oam_net_ip_1}, {get_param: vson_cll_oam_net_ip_2}] + vson_vm_image_name: {get_param: vson_cll_image_name} + vson_vm_flavor_name: {get_param: vson_cll_flavor_name} + vson_dc_unit: {get_param: vson_dc_unit} + vson_clm_oam_net_ip: {get_param: vson_clm_0_oam_net_ip_0} + vson_join_cluster_auth_token: "" + swift_account_auth_token: {get_param: swift_account_auth_token} + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_3_vson_cll_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_3_vson_cll_volume.env new file mode 100644 index 0000000000..61b91ef064 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_3_vson_cll_volume.env @@ -0,0 +1,26 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique name for this VF module instance. +# vf_module_name: module_3_vson_cll_volume + +## First availability zone. +# availability_zone_0: nova + +## Second availability zone. +# availability_zone_1: nova + +## Size of the first volume.Measured in gigabytes. +## Default: 100 +# vson_cll_volume_size_0: 100 + +## Size of the second volume.Measured in gigabytes. +## Default: 100 +# vson_cll_volume_size_1: 100 + +## Size of the third volume.Measured in gigabytes. +## Default: 100 +# vson_cll_volume_size_2: 100 + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_3_vson_cll_volume.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_3_vson_cll_volume.yaml new file mode 100644 index 0000000000..3e203538e7 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_3_vson_cll_volume.yaml @@ -0,0 +1,116 @@ +heat_template_version: 2014-10-16 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: > + Creates Cinder volumes. + Cinder volume is a storage in the form of block devices. + It can be used, for example, for providing storage to instance. + Volume supports creation from snapshot, backup or image. + Also volume can be created only by size. + The template creates volumes for the vSON Cluster leaders + (Virtual Function Component CLL). + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + availability_zone_0: + type: string + label: Availability zone 0 + description: First availability zone. + + availability_zone_1: + type: string + label: Availability zone 1 + description: Second availability zone. + + vson_cll_volume_size_0: + type: number + label: Cinder volume ID 0 size + description: > + Size of the first Cinder volume. Measured in gigabytes. + + vson_cll_volume_size_1: + type: number + label: Cinder volume ID 1 size + description: > + Size of the second Cinder volume. Measured in gigabytes. + + vson_cll_volume_size_2: + type: number + label: Cinder volume ID 2 size + description: > + Size of the third Cinder volume. Measured in gigabytes. + +resources: + + vson_cll_volume_0: + type: OS::Cinder::Volume + properties: + name: + str_replace: + template: VNF_NAME_cll_volume_0 + params: + VNF_NAME: { get_param: vnf_name} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_0} + size: {get_param: vson_cll_volume_size_0} + description: Cinder volume for the first vSON Cluster leader. + + vson_cll_volume_1: + type: OS::Cinder::Volume + properties: + name: + str_replace: + template: VNF_NAME_cll_volume_1 + params: + VNF_NAME: { get_param: vnf_name} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_1} + size: {get_param: vson_cll_volume_size_1} + description: Cinder volume for the second vSON Cluster leader. + + vson_cll_volume_2: + type: OS::Cinder::Volume + properties: + name: + str_replace: + template: VNF_NAME_cll_volume_2 + params: + VNF_NAME: { get_param: vnf_name} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_0} + size: {get_param: vson_cll_volume_size_2} + description: Cinder volume for the third vSON Cluster leader. + +outputs: + + vson_cll_volume_id_0: + value: {get_resource: vson_cll_volume_0} + description: First vSON Cluster leader volume ID. + + vson_cll_volume_id_1: + value: {get_resource: vson_cll_volume_1} + description: Second vSON Cluster leader volume ID. + + vson_cll_volume_id_2: + value: {get_resource: vson_cll_volume_2} + description: Third vSON Cluster leader volume ID. + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_4_vson_dbc.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_4_vson_dbc.env new file mode 100644 index 0000000000..ba9877c2c7 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_4_vson_dbc.env @@ -0,0 +1,76 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique ID for this VF instance. +# vnf_id: 0 + +## Unique name for this VF module instance. +# vf_module_name: module_4_vson_dbc + +## Unique ID for this VF Module instance. +# vf_module_id: 4 + +## The ID of the OAM network. +# oam_net_id: e74c21d6-9d47-4620-9594-7e440b4302b0 + +## Address length prefix for the subnet on the OAM network +# oam_net_subnet_prefix_length: 24 + +## Default gateway.Required for the Sandbox environment. +# default_gateway: 10.56.124.1 + +## List of DNS servers +# dns_servers: 64.102.6.247 + +## List of NTP servers +# ntp_servers: 173.38.201.67 + +## Availability zone. +## NOTE: vSON DBC instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_0: nova + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group intended for vSON DBC. +# vson_dbc_server_group_id: f2e8ab52-4582-4a22-b8f7-88ec8a7bdedd + +## The ID of Security group applied on the port +## bound to the vSON OAM network. +# oam_net_security_group_id: 42e187a1-45cc-4a99-993b-40a42a5cb081 + +## ID of the volume intended for the first vSON DBC instance. +# vson_dbc_volume_id_0: 2c76e40e-097c-4c7d-932c-2e4166bb98df + +## Unique name for the vSON DBC instance. +# vson_dbc_name_0: vson-09.cisco.com + +## VM Image name a vSON DBC instance will be created from. + vson_dbc_image_name: VSON-BASE-1.0 + +## The ID or name of the DBC flavor. + vson_dbc_flavor_name: vson-dbc-flavor + +## Fixed IP assignment for the vSON DBC instance on the OAM network. +# vson_dbc_oam_net_ip_0: 10.56.124.18 + +## IP of the first vSON Cluster Management server. +# vson_clm_0_oam_net_ip_0: 10.56.124.10 + +## Name of the vSON Data Center. +# vson_dc_unit: DC1 + +## Authentication Token generated for the user permitted to add +## a vSON member to existing vSON Cluster and Datacenter. +## Default is the token generated for user "dev".In this case retain the value empty. +# vson_join_cluster_auth_token: "" + +## Swift account auth token. +## Example: 041a5187bb4641f9b89583e2539776b0 +# swift_account_auth_token: 1c3fb715a9c142a9969b9f14617dab94 + +## Number of vSON DBC servers. +# number_of_servers: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_4_vson_dbc.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_4_vson_dbc.yaml new file mode 100644 index 0000000000..3d7fd9d54c --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_4_vson_dbc.yaml @@ -0,0 +1,165 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: The template deploys vSON VFC of type Database Config (DBC). + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance. + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: OAM network subnet prefix length. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + availability_zone_0: + type: string + label: Availability zone 0 + description: Availability zone. + + vson_dbc_server_group_id: + type: string + label: vSON DBS server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON DBS instances. + + vson_dbc_volume_id_0: + type: string + label: vSON DBC Volume ID 0 + description: Volume ID of the vSON DBC server. + + vson_dbc_name_0: + type: string + label: vSON DBC name + description: Unique name to be issued to the vSON DBC server. + + vson_dbc_image_name: + type: string + label: vSON base VM image name + description: VM Image name the vSON DBC instance will be created from. + + vson_dbc_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_dbc_oam_net_ip_0: + type: string + label: vSON DBC OAM network IP address + description: Fixed IP assignment for the vSON DBC instance on the OAM network. + + vson_dc_unit: + type: string + label: vSON Datacenter name + description: vSON Datacenter name. + + vson_clm_0_oam_net_ip_0: + type: string + label: vSON Cluster Manager 0 OAM net IP + description: IP of the first vSON Cluster Management server. + + vson_join_cluster_auth_token: + type: string + label: vSON join cluster auth token + description: > + Authentication Token generated for the user permitted to add + a new vSON Datacenter. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + + number_of_servers: + type: number + label: Number of Servers + description: Number of vSON DBC servers. + constraints: + - range: { min: 1, max: 1} + +resources: + + vson_dbc_group: + type: OS::Heat::ResourceGroup + properties: + count: {get_param: number_of_servers} + resource_def: + type: nested_vson_server_with_vol.yaml + properties: + instance_index: "%index%" + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vfc_role: dbc + oam_net_id: {get_param: oam_net_id} + oam_net_subnet_prefix_length: {get_param: oam_net_subnet_prefix_length} + default_gateway: {get_param: default_gateway} + dns_servers: {get_param: dns_servers} + ntp_servers: {get_param: ntp_servers} + oam_net_security_group_id: {get_param: oam_net_security_group_id} + availability_zones: [{get_param: availability_zone_0}] + vson_server_group_id: {get_param: vson_dbc_server_group_id} + volume_ids: [{get_param: vson_dbc_volume_id_0}] + vson_vm_names: [{get_param: vson_dbc_name_0}] + oam_net_ips: [{get_param: vson_dbc_oam_net_ip_0}] + vson_vm_image_name: {get_param: vson_dbc_image_name} + vson_vm_flavor_name: {get_param: vson_dbc_flavor_name} + vson_dc_unit: {get_param: vson_dc_unit} + vson_clm_oam_net_ip: {get_param: vson_clm_0_oam_net_ip_0} + vson_join_cluster_auth_token: {get_param: vson_join_cluster_auth_token } + swift_account_auth_token: {get_param: swift_account_auth_token} + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_4_vson_dbc_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_4_vson_dbc_volume.env new file mode 100644 index 0000000000..f17c7e0dac --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_4_vson_dbc_volume.env @@ -0,0 +1,18 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique name for this VF module instance. +# vf_module_name: module_4_vson_dbc_volume + +## Availability zone. +# availability_zone_0: nova + +## Volume name +# vson_dbc_volume_name_0: vson_dbc_volume_0 + +## Size of the volume.Measured in gigabytes. +## Default: 50 + vson_dbc_volume_size_0: 50 + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_4_vson_dbc_volume.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_4_vson_dbc_volume.yaml new file mode 100644 index 0000000000..5a847a26d0 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_4_vson_dbc_volume.yaml @@ -0,0 +1,61 @@ +heat_template_version: 2014-10-16 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: > + Creates a Cinder volume. + Cinder volume is a storage in the form of block devices. + It can be used, for example, for providing storage to instance. + Volume supports creation from snapshot, backup or image. + Also volume can be created only by size. + The template creates volume for vSON DB Config servers + (Virtual Function Component DBC). + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + availability_zone_0: + type: string + label: Availability zone 0 + description: Availability zone. + + vson_dbc_volume_name_0: + type: string + label: vSON DBC volume name + description: Volume name. + + vson_dbc_volume_size_0: + type: number + label: vSON DBC cinder volume size + description: Size of the Cinder volume. Measured in gigabytes. + +resources: + + vson_dbc_volume_0: + type: OS::Cinder::Volume + properties: + name: {get_param: vson_dbc_volume_name_0} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_0} + size: {get_param: vson_dbc_volume_size_0} + description: vSON DB Config cinder volume. + +outputs: + + vson_dbc_volume_id_0: + value: {get_resource: vson_dbc_volume_0} + description: vSON DB Config volume ID. + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_5_vson_dbg.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_5_vson_dbg.env new file mode 100644 index 0000000000..94c84a496b --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_5_vson_dbg.env @@ -0,0 +1,76 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique ID for this VF instance. +# vnf_id: 0 + +## Unique name for this VF module instance. +# vf_module_name: module_5_vson_dbg + +## Unique ID for this VF Module instance. +# vf_module_id: 5 + +## The ID of the OAM network. +# oam_net_id: e74c21d6-9d47-4620-9594-7e440b4302b0 + +## Address length prefix for the subnet on the OAM network +# oam_net_subnet_prefix_length: 24 + +## Default gateway.Required for the Sandbox environment. +# default_gateway: 10.56.124.1 + +## List of DNS servers +# dns_servers: 64.102.6.247 + +## List of NTP servers +# ntp_servers: 173.38.201.67 + +## Availability zone. +## NOTE: vSON DBG instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_0: nova + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group intended for vSON DBG. +# vson_dbg_server_group_id: 9e74765d-8aeb-463f-aa41-7999d6d1e5b9 + +## The ID of Security group applied on the port +## bound to the vSON OAM network. +# oam_net_security_group_id: 42e187a1-45cc-4a99-993b-40a42a5cb081 + +## ID of the volume intended for the first vSON DBG instance. +# vson_dbg_volume_id_0: 78c30f76-8fea-4cd9-a909-2d1f2724a422 + +## Unique name for the vSON DBG instance. +# vson_dbg_name_0: vson-10.cisco.com + +## VM Image name a vSON DBG instance will be created from. + vson_dbg_image_name: VSON-BASE-1.0 + +## The ID or name of the DBG flavor. + vson_dbg_flavor_name: vson-dbg-flavor + +## Fixed IP assignment for the vSON DBG instance on the OAM network. +# vson_dbg_oam_net_ip_0: 10.56.124.19 + +## IP of the first vSON Cluster Management server. +# vson_clm_0_oam_net_ip_0: 10.56.124.10 + +## Name of the vSON Data Center. +# vson_dc_unit: DC1 + +## Authentication Token generated for the user permitted to add +## a vSON member to existing vSON Cluster and Datacenter. +## Default is the token generated for user "dev".In this case retain the value empty. +# vson_join_cluster_auth_token: "" + +## Swift account auth token. +## Example: 041a5187bb4641f9b89583e2539776b0 +# swift_account_auth_token: 1c3fb715a9c142a9969b9f14617dab94 + +## Number of vSON DBG servers. +# number_of_servers: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_5_vson_dbg.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_5_vson_dbg.yaml new file mode 100644 index 0000000000..8daf7ee665 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_5_vson_dbg.yaml @@ -0,0 +1,165 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: The template deploys vSON VFC of type Database Global (DBG). + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance. + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: OAM network subnet prefix length. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + availability_zone_0: + type: string + label: Availability zone 0 + description: Availability zone. + + vson_dbg_server_group_id: + type: string + label: vSON DBS server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON DBS instances. + + vson_dbg_volume_id_0: + type: string + label: vSON DBG Volume ID 0 + description: Volume ID of the vSON DBG server. + + vson_dbg_name_0: + type: string + label: vSON DBG name + description: Unique name to be issued to the vSON DBG server. + + vson_dbg_image_name: + type: string + label: vSON base VM image name + description: VM Image name the vSON DBG instance will be created from. + + vson_dbg_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_dbg_oam_net_ip_0: + type: string + label: vSON DBG OAM network IP address + description: Fixed IP assignment for the vSON DBG instance on the OAM network. + + vson_dc_unit: + type: string + label: vSON Datacenter name + description: vSON Datacenter name. + + vson_clm_0_oam_net_ip_0: + type: string + label: vSON Cluster Manager 0 OAM net IP + description: IP of the first vSON Cluster Management server. + + vson_join_cluster_auth_token: + type: string + label: vSON join cluster auth token + description: > + Authentication Token generated for the user permitted to add + a new vSON Datacenter. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + + number_of_servers: + type: number + label: Number of Servers + description: Number of vSON DBG servers. + constraints: + - range: { min: 1, max: 1} + +resources: + + vson_dbg_group: + type: OS::Heat::ResourceGroup + properties: + count: {get_param: number_of_servers} + resource_def: + type: nested_vson_server_with_vol.yaml + properties: + instance_index: "%index%" + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vfc_role: dbg + oam_net_id: {get_param: oam_net_id} + oam_net_subnet_prefix_length: {get_param: oam_net_subnet_prefix_length} + default_gateway: {get_param: default_gateway} + dns_servers: {get_param: dns_servers} + ntp_servers: {get_param: ntp_servers} + oam_net_security_group_id: {get_param: oam_net_security_group_id} + availability_zones: [{get_param: availability_zone_0}] + vson_server_group_id: {get_param: vson_dbg_server_group_id} + volume_ids: [{get_param: vson_dbg_volume_id_0}] + vson_vm_names: [{get_param: vson_dbg_name_0}] + oam_net_ips: [{get_param: vson_dbg_oam_net_ip_0}] + vson_vm_image_name: {get_param: vson_dbg_image_name} + vson_vm_flavor_name: {get_param: vson_dbg_flavor_name} + vson_dc_unit: {get_param: vson_dc_unit} + vson_clm_oam_net_ip: {get_param: vson_clm_0_oam_net_ip_0} + vson_join_cluster_auth_token: {get_param: vson_join_cluster_auth_token } + swift_account_auth_token: {get_param: swift_account_auth_token} + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_5_vson_dbg_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_5_vson_dbg_volume.env new file mode 100644 index 0000000000..979672bf14 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_5_vson_dbg_volume.env @@ -0,0 +1,18 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique name for this VF module instance. +# vf_module_name: module_5_vson_dbg_volume + +## Availability zone. +# availability_zone_0: nova + +## Volume name +# vson_dbg_volume_name_0: vson_dbg_volume_0 + +## Size of the first volume.Measured in gigabytes. +## Default: 200 + vson_dbg_volume_size_0: 200 + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_5_vson_dbg_volume.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_5_vson_dbg_volume.yaml new file mode 100644 index 0000000000..a2c0739a92 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_5_vson_dbg_volume.yaml @@ -0,0 +1,62 @@ +heat_template_version: 2014-10-16 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: > + Creates a Cinder volume. + Cinder volume is a storage in the form of block devices. + It can be used, for example, for providing storage to instance. + Volume supports creation from snapshot, backup or image. + Also volume can be created only by size. + The template creates volumes for vSON DB Global servers + (Virtual Function Component DBG). + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + availability_zone_0: + type: string + label: Availability zone 0 + description: Availability zone. + + vson_dbg_volume_name_0: + type: string + label: vSON DBG volume name + description: Volume name. + + vson_dbg_volume_size_0: + type: number + label: vSON DBG cinder volume size + description: > + Size of the Cinder volume. Measured in gigabytes. + +resources: + + vson_dbg_volume_0: + type: OS::Cinder::Volume + properties: + name: {get_param: vson_dbg_volume_name_0} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_0} + size: {get_param: vson_dbg_volume_size_0} + description: vSON DB Global cinder volume. + +outputs: + + vson_dbg_volume_id_0: + value: {get_resource: vson_dbg_volume_0} + description: vSON DB Global volume ID. + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_6_vson_dbs.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_6_vson_dbs.env new file mode 100644 index 0000000000..9738bd5f3d --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_6_vson_dbs.env @@ -0,0 +1,90 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique ID for this VF instance. +# vnf_id: 0 + +## Unique name for this VF module instance. +# vf_module_name: module_6_vson_dbs + +## Unique ID for this VF Module instance. +# vf_module_id: 6 + +## The ID of the OAM network. +# oam_net_id: e74c21d6-9d47-4620-9594-7e440b4302b0 + +## Address length prefix for the subnet on the OAM network +# oam_net_subnet_prefix_length: 24 + +## Default gateway.Required for the Sandbox environment. +# default_gateway: 10.56.124.1 + +## List of DNS servers +# dns_servers: 64.102.6.247 + +## List of NTP servers +# ntp_servers: 173.38.201.67 + +## First availability zone. +## NOTE: vSON DBS instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_0: nova + +## Second availability zone. +## NOTE: vSON DBS instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_1: nova + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group intended for vSON DBS. +# vson_dbs_server_group_id: c301c8b7-ddfd-4e81-8b9b-fedc8f339cc2 + +## The ID of Security group applied on the port +## bound to the vSON OAM network. +# oam_net_security_group_id: 42e187a1-45cc-4a99-993b-40a42a5cb081 + +## ID of the volume intended for the first vSON DBS instance. +# vson_dbs_volume_id_0: 69b10528-c597-48bc-8cb2-e9113b3dc989 + +## ID of the volume intended for the second vSON DBS instance. +# vson_dbs_volume_id_1: 5c7fc4ef-db53-4956-85dc-82aaf8c8f3d4 + +## Unique name for the first vSON DBS instance. +# vson_dbs_name_0: vson-11.cisco.com + +## Unique name for the second vSON DBS instance. +# vson_dbs_name_1: vson-12.cisco.com + +## VM Image name a vSON DBS instance will be created from. + vson_dbs_image_name: VSON-BASE-1.0 + +## The ID or name of the DBS flavor. + vson_dbs_flavor_name: vson-dbs-flavor + +## Fixed IP assignment for the first vSON DBS instance on the OAM network. +# vson_dbs_oam_net_ip_0: 10.56.124.22 + +## Fixed IP assignment for the second vSON DBS instance on the OAM network. +# vson_dbs_oam_net_ip_1: 10.56.124.23 + +## IP of the first vSON Cluster Management server. +# vson_clm_0_oam_net_ip_0: 10.56.124.10 + +## Name of the vSON Data Center. +# vson_dc_unit: DC1 + +## Authentication Token generated for the user permitted to add +## a vSON member to existing vSON Cluster and Datacenter. +## Default is the token generated for user "dev".In this case retain the value empty. +# vson_join_cluster_auth_token: "" + +## Swift account auth token. +## Example: 041a5187bb4641f9b89583e2539776b0 +# swift_account_auth_token: 7a59a591e7444be0893bd5c179330299 + +## Number of vSON DBS servers. +# number_of_servers: 2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_6_vson_dbs.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_6_vson_dbs.yaml new file mode 100644 index 0000000000..9eabebebaf --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_6_vson_dbs.yaml @@ -0,0 +1,187 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: > + The template deploys vSON VFC of type Database Shard (DBS) + VM instances: Primary and Secondary. + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance. + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: OAM network subnet prefix length. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + availability_zone_0: + type: string + label: Availability zone 0 + description: First availability zone. + + availability_zone_1: + type: string + label: Availability zone 1 + description: Second availability zone. + + vson_dbs_server_group_id: + type: string + label: vSON DBS server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON DBS instances. + + vson_dbs_volume_id_0: + type: string + label: vSON DBS Volume ID 0 + description: Volume ID of the first vSON DBS server. + + vson_dbs_volume_id_1: + type: string + label: vSON DBS Volume ID 1 + description: Volume ID of the second vSON DBS server. + + vson_dbs_name_0: + type: string + label: First vSON DBS name + description: Unique name to be issued to the first vSON DBS server. + + vson_dbs_name_1: + type: string + label: Second vSON DBS name + description: Unique name to be issued to the second vSON DBS server. + + vson_dbs_image_name: + type: string + label: vSON base VM image name + description: VM Image name the vSON DBS instance will be created from. + + vson_dbs_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_dbs_oam_net_ip_0: + type: string + label: vSON DBS OAM network IP address 0 + description: Fixed IP assignment for the first vSON DBS instance on the OAM network. + + vson_dbs_oam_net_ip_1: + type: string + label: vSON DBS OAM network IP address 1 + description: Fixed IP assignment for the second vSON DBS instance on the OAM network. + + vson_dc_unit: + type: string + label: vSON Datacenter name + description: vSON Datacenter name. + + vson_clm_0_oam_net_ip_0: + type: string + label: vSON Cluster Manager 0 OAM net IP + description: IP of the first vSON Cluster Management server. + + vson_join_cluster_auth_token: + type: string + label: vSON join cluster auth token + description: > + Authentication Token generated for the user permitted to add + a new vSON Datacenter. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + + number_of_servers: + type: number + label: Number of Servers + description: Number of vSON DBS servers. + constraints: + - range: { min: 1, max: 2} + +resources: + + vson_dbs_group: + type: OS::Heat::ResourceGroup + properties: + count: {get_param: number_of_servers} + resource_def: + type: nested_vson_server_with_vol.yaml + properties: + instance_index: "%index%" + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vfc_role: dbs + oam_net_id: {get_param: oam_net_id} + oam_net_subnet_prefix_length: {get_param: oam_net_subnet_prefix_length} + default_gateway: {get_param: default_gateway} + dns_servers: {get_param: dns_servers} + ntp_servers: {get_param: ntp_servers} + oam_net_security_group_id: {get_param: oam_net_security_group_id} + availability_zones: [{get_param: availability_zone_0}, {get_param: availability_zone_1}] + vson_server_group_id: {get_param: vson_dbs_server_group_id} + volume_ids: [{get_param: vson_dbs_volume_id_0}, {get_param: vson_dbs_volume_id_1}] + vson_vm_names: [{get_param: vson_dbs_name_0}, {get_param: vson_dbs_name_1}] + oam_net_ips: [{get_param: vson_dbs_oam_net_ip_0}, {get_param: vson_dbs_oam_net_ip_1}] + vson_vm_image_name: {get_param: vson_dbs_image_name} + vson_vm_flavor_name: {get_param: vson_dbs_flavor_name} + vson_dc_unit: {get_param: vson_dc_unit} + vson_clm_oam_net_ip: {get_param: vson_clm_0_oam_net_ip_0} + vson_join_cluster_auth_token: {get_param: vson_join_cluster_auth_token } + swift_account_auth_token: {get_param: swift_account_auth_token} + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_6_vson_dbs_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_6_vson_dbs_volume.env new file mode 100644 index 0000000000..a883d91120 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_6_vson_dbs_volume.env @@ -0,0 +1,28 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique name for this VF module instance. +# vf_module_name: module_6_vson_dbs_volume + +## First availability zone. +# availability_zone_0: nova + +## Second availability zone. +# availability_zone_1: nova + +## Name for the first volume. +# vson_dbs_volume_name_0: vson_dbs_volume_0 + +## Name for the second volume. +# vson_dbs_volume_name_1: vson_dbs_volume_1 + +## Size of the volume.Measured in gigabytes. +## Default: 500 + vson_dbs_volume_size_0: 500 + +## Size of the volume.Measured in gigabytes. +## Default: 500 + vson_dbs_volume_size_1: 500 + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_6_vson_dbs_volume.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_6_vson_dbs_volume.yaml new file mode 100644 index 0000000000..b16bbde3b5 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_6_vson_dbs_volume.yaml @@ -0,0 +1,94 @@ +heat_template_version: 2014-10-16 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: > + Creates Cinder volumes. + Cinder volume is a storage in the form of block devices. + It can be used, for example, for providing storage to instance. + Volume supports creation from snapshot, backup or image. + Also volume can be created only by size. + The template creates volumes for vSON Database servers configured for sharding + (Virtual Function Component DBS). + The shard consists of two Database instances: + - Primary + - Secondary + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + availability_zone_0: + type: string + label: Availability zone 0 + description: First availability zone. + + availability_zone_1: + type: string + label: Availability zone 1 + description: Second availability zone. + + vson_dbs_volume_name_0: + type: string + label: vSON DBS volume name 0 + description: First volume name. + + vson_dbs_volume_name_1: + type: string + label: vSON DBS volume name 1 + description: Second volume name. + + vson_dbs_volume_size_0: + type: number + label: vSON DBS volume ID 0 size + description: Size of the first Cinder volume. Measured in gigabytes. + + vson_dbs_volume_size_1: + type: number + label: vSON DBS volume ID 1 size + description: Size of the second Cinder volume. Measured in gigabytes. + +resources: + + vson_dbs_volume_0: + type: OS::Cinder::Volume + properties: + name: {get_param: vson_dbs_volume_name_0} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_0} + size: {get_param: vson_dbs_volume_size_0} + description: Cinder volume for the first vSON DBS VM instance. + + vson_dbs_volume_1: + type: OS::Cinder::Volume + properties: + name: {get_param: vson_dbs_volume_name_1} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_1} + size: {get_param: vson_dbs_volume_size_1} + description: Cinder volume for the second vSON DBS VM instance. + +outputs: + + vson_dbs_volume_id_0: + value: {get_resource: vson_dbs_volume_0} + description: ID of the first vSON DBS volume. + + vson_dbs_volume_id_1: + value: {get_resource: vson_dbs_volume_1} + description: ID of the second vSON DBS volume. + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_7_vson_app.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_7_vson_app.env new file mode 100644 index 0000000000..6fc5f45c0c --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_7_vson_app.env @@ -0,0 +1,85 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique ID for this VF instance. +# vnf_id: 0 + +## Unique name for this VF module instance. +# vf_module_name: module_7_vson_app + +## Unique ID for this VF Module instance. +# vf_module_id: 7 + +## The ID of the OAM network. +# oam_net_id: e74c21d6-9d47-4620-9594-7e440b4302b0 + +## Address length prefix for the IPv4 subnet on the OAM network +# oam_net_subnet_prefix_length: 24 + +## Address length prefix for the IPv6 subnet on the OAM network +# oam_net_subnet_v6_prefix_length: 64 + +## Default IPv4 gateway.Required for Sandbox. +# default_gateway: 10.56.124.1 + +## Default IPv6 gateway. Optional parameter. +# default_gateway_v6: "" + +## List of DNS servers +# dns_servers: 64.102.6.247 + +## List of NTP servers +# ntp_servers: 173.38.201.67 + +## Availability zone. +## NOTE: vSON APP instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_0: nova + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group intended for vSON APP. +# vson_app_server_group_id: 9e74765d-8aeb-463f-aa41-7999d6d1e5b9 + +## The ID of Security group applied on the port +## bound to the vSON OAM network. +# oam_net_security_group_id: 42e187a1-45cc-4a99-993b-40a42a5cb081 + +## ID of the volume intended for the vSON APP server. +# vson_app_volume_id_0: f7a863a0-7256-40bb-91f3-4b43a063a40f + +## Unique name for the vSON APP server. + vson_app_name_0: vson-13.cisco.com + +## VM Image name the vSON APP instance will be created from. + vson_app_image_name: VSON-BASE-1.0 + +## The ID or name of the APP flavor. + vson_app_flavor_name: vson-app-flavor + +## Fixed IPv4 assignment for the APP instance on the OAM network. +# vson_app_oam_net_ip_0: 10.56.124.24 + +## Fixed IPv6 assignment for the APP instance on the OAM network. +# vson_app_oam_net_v6_ip_0: 2606:ae00:2e01:3a0::5 + +## IP of the first vSON Cluster Management server. +# vson_clm_0_oam_net_ip_0: 10.56.124.10 + +## Name of the vSON Data Center. +# vson_dc_unit: DC1 + +## Authentication Token generated for the user permitted to add +## a vSON member to existing vSON Cluster and Datacenter. +## Default is the token generated for user "dev".In this case retain the value empty. +# vson_join_cluster_auth_token: "" + +## Swift account auth token. +## Example: 041a5187bb4641f9b89583e2539776b0 +# swift_account_auth_token: 25c73d2e68944c728d3501f51d518921 + +## Number of vSON APP servers. +# number_of_servers: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_7_vson_app.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_7_vson_app.yaml new file mode 100644 index 0000000000..0fe22800c5 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_7_vson_app.yaml @@ -0,0 +1,182 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: The template deploys vSON VFC of type APP. + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance. + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net IPv4 subnet prefix length + description: OAM network IPv4 subnet prefix length. + + oam_net_subnet_v6_prefix_length: + type: string + label: OAM net IPv6 subnet prefix length + description: OAM network IPv6 subnet prefix length. + + default_gateway: + type: string + label: Default IPv4 gateway + description: Default IPv4 gateway. + + default_gateway_v6: + type: string + label: Default IPv6 gateway + description: Default IPv6 gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + availability_zone_0: + type: string + label: Availability zone 0 + description: Availability zone. + + vson_app_server_group_id: + type: string + label: vSON APP server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON APP instances. + + vson_app_volume_id_0: + type: string + label: vSON APP Volume ID 0 + description: Volume ID of the vSON APP server. + + vson_app_name_0: + type: string + label: vSON APP instance name + description: Unique name to be issued to the vSON APP instance. + + vson_app_image_name: + type: string + label: vSON base VM image name + description: VM Image name the vSON APP instance will be created from. + + vson_app_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_app_oam_net_ip_0: + type: string + label: vSON APP OAM network IPv4 address + description: Fixed IPv4 assignment for the vSON APP instance on the OAM network. + + vson_app_oam_net_v6_ip_0: + type: string + label: vSON APP OAM network IPv6 address + description: Fixed IPv6 assignment for the vSON APP instance on the OAM network. + + vson_dc_unit: + type: string + label: vSON Datacenter name + description: vSON Datacenter name. + + vson_clm_0_oam_net_ip_0: + type: string + label: vSON Cluster Manager 0 OAM net IP + description: IP of the first vSON Cluster Management server. + + vson_join_cluster_auth_token: + type: string + label: vSON join cluster auth token + description: > + Authentication Token generated for the user permitted to add + a new vSON Datacenter. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + + number_of_servers: + type: number + label: Number of Servers + description: Number of vSON APP servers. + constraints: + - range: { min: 1, max: 1} + +resources: + + vson_app_group: + type: OS::Heat::ResourceGroup + properties: + count: {get_param: number_of_servers} + resource_def: + type: nested_vson_server_with_vol_dual_ip_stack.yaml + properties: + instance_index: "%index%" + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vfc_role: app + oam_net_id: {get_param: oam_net_id} + oam_net_subnet_prefix_length: {get_param: oam_net_subnet_prefix_length} + oam_net_subnet_v6_prefix_length: {get_param: oam_net_subnet_v6_prefix_length} + default_gateway: {get_param: default_gateway} + default_gateway_v6: {get_param: default_gateway_v6} + dns_servers: {get_param: dns_servers} + ntp_servers: {get_param: ntp_servers} + oam_net_security_group_id: {get_param: oam_net_security_group_id} + availability_zones: [{get_param: availability_zone_0}] + vson_server_group_id: {get_param: vson_app_server_group_id} + volume_ids: [{get_param: vson_app_volume_id_0}] + vson_vm_names: [{get_param: vson_app_name_0}] + oam_net_ips: [{get_param: vson_app_oam_net_ip_0}] + oam_net_v6_ips: [{get_param: vson_app_oam_net_v6_ip_0}] + vson_vm_image_name: {get_param: vson_app_image_name} + vson_vm_flavor_name: {get_param: vson_app_flavor_name} + vson_dc_unit: {get_param: vson_dc_unit} + vson_clm_oam_net_ip: {get_param: vson_clm_0_oam_net_ip_0} + vson_join_cluster_auth_token: {get_param: vson_join_cluster_auth_token } + swift_account_auth_token: {get_param: swift_account_auth_token} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_7_vson_app_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_7_vson_app_volume.env new file mode 100644 index 0000000000..500ceb05f0 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_7_vson_app_volume.env @@ -0,0 +1,18 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique name for this VF module instance. +# vf_module_name: module_7_vson_app_volume + +## Availability zone. +# availability_zone_0: nova + +## Volume name +# vson_app_volume_name_0: vson_app_volume_0 + +## Size of the volume.Measured in gigabytes. +## Default: 200 + vson_app_volume_size_0: 200 + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_7_vson_app_volume.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_7_vson_app_volume.yaml new file mode 100644 index 0000000000..80538c3e0a --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_7_vson_app_volume.yaml @@ -0,0 +1,62 @@ +heat_template_version: 2014-10-16 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: > + Creates a Cinder volume. + Cinder volume is a storage in the form of block devices. + It can be used, for example, for providing storage to instance. + Volume supports creation from snapshot, backup or image. + Also volume can be created only by size. + The template creates volume for vSON APP server + (Virtual Function Component APP). + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + availability_zone_0: + type: string + label: Availability zone 0 + description: First availability zone. + + vson_app_volume_name_0: + type: string + label: vSON APP volume name + description: Volume name. + + vson_app_volume_size_0: + type: number + label: vSON APP cinder volume size + description: > + Size of the Cinder volume. Measured in gigabytes. + +resources: + + vson_app_volume_0: + type: OS::Cinder::Volume + properties: + name: {get_param: vson_app_volume_name_0} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_0} + size: {get_param: vson_app_volume_size_0} + description: vSON APP cinder volume. + +outputs: + + vson_app_volume_id_0: + value: {get_resource: vson_app_volume_0} + description: vSON APP volume ID. + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_8_vson_dcl.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_8_vson_dcl.env new file mode 100644 index 0000000000..780ee33bce --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_8_vson_dcl.env @@ -0,0 +1,99 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique ID for this VF instance. +# vnf_id: 0 + +## Unique name for this VF module instance. +# vf_module_name: module_8_vson_dcl + +## Unique ID for this VF Module instance. +# vf_module_id: 8 + +## The ID of the OAM network. +# oam_net_id: e74c21d6-9d47-4620-9594-7e440b4302b0 + +## Address length prefix for the subnet on the OAM network +# oam_net_subnet_prefix_length: 24 + +## Default gateway.Required for Sandbox. +# default_gateway: 10.56.124.1 + +## List of DNS servers +# dns_servers: 64.102.6.247 + +## List of NTP servers +# ntp_servers: 173.38.201.67 + +## First availability zone for vSON DC leaders. +## NOTE: vSON DC leader instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_0: nova + +## Second availability zone for vSON DC leaders. +## NOTE: vSON DC leader instance should be located in the same +## Availability Zone as its related Cinder Volume. +# availability_zone_1: nova + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group intended for vSON Datacenter leaders. +# vson_leader_server_group_id: 138c78ff-3552-4ee7-ad9d-a5b78427bdd0 + +## The ID of Security group applied on the port +## bound to the vSON OAM network. +# oam_net_security_group_id: 42e187a1-45cc-4a99-993b-40a42a5cb081 + +## ID of the volume intended for the first vSON DC leader. +# vson_dcl_volume_id_0: 2136e379-d3e7-4202-a81c-d071e45bfa2a + +## ID of the volume intended for the second vSON DC leader. +# vson_dcl_volume_id_1: e82f70ee-c1d6-43fe-a816-0ef1ed1a8ce2 + +## ID of the volume intended for the third vSON DC leader. +# vson_dcl_volume_id_2: 0ab311f0-04d1-422f-a0bd-c6e881600325 + +## Unique name for the first vSON DC leader. +# vson_dcl_name_0: vson-14.cisco.com + +## Unique name for the second vSON DC leader. +# vson_dcl_name_1: vson-15.cisco.com + +## Unique name for the third vSON DC leader. +# vson_dcl_name_2: vson-16.cisco.com + +## VM Image name a vSON DC leader instance will be created from. +# vson_dcl_image_name: VSON-BASE-1.0 + +## The ID or name of the DC leader flavor. +# vson_dcl_flavor_name: vson-dcl-flavor + +## Fixed IP assignment for the first vSON DC leader instance on the OAM network. +# vson_dcl_oam_net_ip_0: 10.56.124.25 + +## Fixed IP assignment for the second vSON DC leader instance on the OAM network. +# vson_dcl_oam_net_ip_1: 10.56.124.26 + +## Fixed IP assignment for the third vSON DC leader instance on the OAM network. +# vson_dcl_oam_net_ip_2: 10.56.124.27 + +## IP of the first vSON Cluster Management server. +# vson_clm_0_oam_net_ip_0: 10.56.124.10 + +## Name of the vSON Data Center. +# vson_dc_unit: DC2 + +## Authentication Token generated for the user permitted to add +## a vSON member to existing vSON Cluster and Datacenter. +## Default is the token generated for user "dev".In this case retain the value empty. +# vson_join_cluster_auth_token: "" + +## Swift account auth token. +## Example: 041a5187bb4641f9b89583e2539776b0 +# swift_account_auth_token: 373b32612bf74cbf98c4000cc7f885fd + +## Number of vSON DC leaders. +# number_of_servers: 3 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_8_vson_dcl.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_8_vson_dcl.yaml new file mode 100644 index 0000000000..da6bab10f5 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_8_vson_dcl.yaml @@ -0,0 +1,200 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: The template deploys vSON Datacenter. + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance. + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: OAM network subnet prefix length. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + availability_zone_0: + type: string + label: Availability zone 0 + description: First availability zone. + + availability_zone_1: + type: string + label: Availability zone 1 + description: Second availability zone. + + vson_leader_server_group_id: + type: string + label: vSON Cluster leader server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON DC leaders. + + vson_dcl_volume_id_0: + type: string + label: vSON DC Leader Volume ID 0 + description: Volume ID of the first vSON DC leader. + + vson_dcl_volume_id_1: + type: string + label: vSON DC Leader Volume ID 1 + description: Volume ID of the second vSON DC leader. + + vson_dcl_volume_id_2: + type: string + label: vSON DC Leader Volume ID 2 + description: Volume ID of the third vSON DC leader. + + vson_dcl_name_0: + type: string + label: First vSON DC leader name + description: Unique name to be issued to the first vSON DC leader. + + vson_dcl_name_1: + type: string + label: Second vSON DC leader name + description: Unique name to be issued to the second vSON DC leader. + + vson_dcl_name_2: + type: string + label: Third vSON DC leader name + description: Unique name to be issued to the third vSON DC leader. + + vson_dcl_image_name: + type: string + label: vSON base VM image name + description: VM Image name the vSON DC leader instance will be created from. + + vson_dcl_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_dcl_oam_net_ip_0: + type: string + label: vSON DC leader OAM network IP address 0 + description: Fixed IP assignment for the first vSON DC leader instance on the OAM network. + + vson_dcl_oam_net_ip_1: + type: string + label: vSON DC leader OAM network IP address 1 + description: Fixed IP assignment for the second vSON DC leader instance on the OAM network. + + vson_dcl_oam_net_ip_2: + type: string + label: vSON DC leader OAM network IP address 2 + description: Fixed IP assignment for the third vSON DC leader instance on the OAM network. + + vson_dc_unit: + type: string + label: vSON Datacenter name + description: vSON Datacenter name. + + vson_clm_0_oam_net_ip_0: + type: string + label: vSON Cluster Manager 0 OAM net IP + description: IP of the first vSON Cluster Management server. + + vson_join_cluster_auth_token: + type: string + label: vSON join cluster auth token + description: > + Authentication Token generated for the user permitted to add + a new vSON Datacenter. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + + number_of_servers: + type: number + label: Number of Servers + description: Number of vSON DC leaders. + constraints: + - range: { min: 1, max: 3} + +resources: + + vson_dcl_group: + type: OS::Heat::ResourceGroup + properties: + count: {get_param: number_of_servers} + resource_def: + type: nested_vson_server_with_vol.yaml + properties: + instance_index: "%index%" + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vfc_role: dcl + oam_net_id: {get_param: oam_net_id} + oam_net_subnet_prefix_length: {get_param: oam_net_subnet_prefix_length} + default_gateway: {get_param: default_gateway} + dns_servers: {get_param: dns_servers} + ntp_servers: {get_param: ntp_servers} + oam_net_security_group_id: {get_param: oam_net_security_group_id} + availability_zones: [{get_param: availability_zone_0}, {get_param: availability_zone_1}, {get_param: availability_zone_0}] + vson_server_group_id: {get_param: vson_leader_server_group_id} + volume_ids: [{get_param: vson_dcl_volume_id_0}, {get_param: vson_dcl_volume_id_1}, {get_param: vson_dcl_volume_id_2}] + vson_vm_names: [{get_param: vson_dcl_name_0}, {get_param: vson_dcl_name_1}, {get_param: vson_dcl_name_2}] + oam_net_ips: [{get_param: vson_dcl_oam_net_ip_0}, {get_param: vson_dcl_oam_net_ip_1}, {get_param: vson_dcl_oam_net_ip_2}] + vson_vm_image_name: {get_param: vson_dcl_image_name} + vson_vm_flavor_name: {get_param: vson_dcl_flavor_name} + vson_dc_unit: {get_param: vson_dc_unit} + vson_clm_oam_net_ip: {get_param: vson_clm_0_oam_net_ip_0} + vson_join_cluster_auth_token: {get_param: vson_join_cluster_auth_token } + swift_account_auth_token: {get_param: swift_account_auth_token} + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_8_vson_dcl_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_8_vson_dcl_volume.env new file mode 100644 index 0000000000..465dd143a1 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_8_vson_dcl_volume.env @@ -0,0 +1,26 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique name for this VF module instance. +# vf_module_name: module_8_vson_dcl_volume + +## First availability zone. +# availability_zone_0: nova + +## Second availability zone. +# availability_zone_1: nova + +## Size of the first volume.Measured in gigabytes. +## Default: 200 + vson_dcl_volume_size_0: 200 + +## Size of the second volume.Measured in gigabytes. +## Default: 200 + vson_dcl_volume_size_1: 200 + +## Size of the third volume.Measured in gigabytes. +## Default: 200 + vson_dcl_volume_size_2: 200 + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_8_vson_dcl_volume.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_8_vson_dcl_volume.yaml new file mode 100644 index 0000000000..ba12ebcbd1 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_8_vson_dcl_volume.yaml @@ -0,0 +1,116 @@ +heat_template_version: 2014-10-16 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: > + Creates Cinder volumes. + Cinder volume is a storage in the form of block devices. + It can be used, for example, for providing storage to instance. + Volume supports creation from snapshot, backup or image. + Also volume can be created only by size. + The template creates volumes for vSON DC leaders + (Virtual Function Component DCL). + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + availability_zone_0: + type: string + label: Availability zone 0 + description: First availability zone. + + availability_zone_1: + type: string + label: Availability zone 1 + description: Second availability zone. + + vson_dcl_volume_size_0: + type: number + label: Cinder volume ID 0 size + description: > + Size of the first Cinder volume. Measured in gigabytes. + + vson_dcl_volume_size_1: + type: number + label: Cinder volume ID 1 size + description: > + Size of the second Cinder volume. Measured in gigabytes. + + vson_dcl_volume_size_2: + type: number + label: Cinder volume ID 2 size + description: > + Size of the third Cinder volume. Measured in gigabytes. + +resources: + + vson_dcl_volume_0: + type: OS::Cinder::Volume + properties: + name: + str_replace: + template: VNF_NAME_dcl_volume_0 + params: + VNF_NAME: { get_param: vnf_name} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_0} + size: {get_param: vson_dcl_volume_size_0} + description: Cinder volume for the first vSON DC leader. + + vson_dcl_volume_1: + type: OS::Cinder::Volume + properties: + name: + str_replace: + template: VNF_NAME_dcl_volume_1 + params: + VNF_NAME: { get_param: vnf_name} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_1} + size: {get_param: vson_dcl_volume_size_1} + description: Cinder volume for the second vSON DC leader. + + vson_dcl_volume_2: + type: OS::Cinder::Volume + properties: + name: + str_replace: + template: VNF_NAME_dcl_volume_2 + params: + VNF_NAME: { get_param: vnf_name} + metadata: + vnf_name: {get_param: vnf_name} + vf_module_name: {get_param: vf_module_name} + availability_zone: {get_param: availability_zone_0} + size: {get_param: vson_dcl_volume_size_2} + description: Cinder volume for the third vSON DC leader. + +outputs: + + vson_dcl_volume_id_0: + value: {get_resource: vson_dcl_volume_0} + description: ID of the first vSON DC leader volume. + + vson_dcl_volume_id_1: + value: {get_resource: vson_dcl_volume_1} + description: ID of the second vSON DC leader volume. + + vson_dcl_volume_id_2: + value: {get_resource: vson_dcl_volume_2} + description: ID of the third vSON DC leader volume. + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_9_vson_clm.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_9_vson_clm.env new file mode 100644 index 0000000000..3eac88d6fd --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_9_vson_clm.env @@ -0,0 +1,63 @@ +parameters: + +## Unique name for this VF instance. +# vnf_name: vson + +## Unique ID for this VF instance. +# vnf_id: 0 + +## Unique name for this VF module instance. +# vf_module_name: module_9_vson_clm + +## Unique ID for this VF Module instance. +# vf_module_id: 9 + +## The ID of the OAM network. +# oam_net_id: 9257287a-8504-43fe-859f-b5ef8fde04bc + +## Address length prefix for the subnet on the OAM network +# oam_net_subnet_prefix_length: 24 + +## Default gateway +# default_gateway: 172.20.50.1 + +## List of DNS servers +# dns_servers: 8.8.8.8 + +## List of NTP servers +# ntp_servers: 155.165.201.253,155.165.201.252,155.165.201.251 + +## Availability zone. +# availability_zone_0: nova + +## Tells what policy should be applied to the ServerGroup. +## Affinity policy will force instances to share the same hypervisor. +## Anti-affinity will force instances to run in different hypervisors. +## The group intended for vSON CLM. +# vson_clm_server_group_id: d616da20-5108-4af1-ab58-7c04462cd37c + +## The ID of Security group applied on the port +## bound to the vSON OAM network. +# oam_net_security_group_id: 0730af4e-cc4f-4e3f-9439-1a76eddf5f06 + +## Unique name for the vSON Cluster Management server. +# vson_clm_name_0: vson_clm_0 + +## VM Image name the vSON Cluster management instance will be created from. + vson_clm_image_name: VSON-BASE-1.0 + +## The ID or name of the CLM flavor. + vson_clm_flavor_name: vson-clm-flavor + +## Fixed IP assignment for the vSON CLM instance on the OAM network. + vson_clm_oam_net_ip_0: 172.20.50.3 + +## IP of the first vSON Cluster Management server. +# vson_clm_0_oam_net_ip_0: "" + +## Swift account auth token. +## Example: 041a5187bb4641f9b89583e2539776b0 +# swift_account_auth_token: fdd0b02849864af58781cffe78252cd7 + +## Number of vSON CLM servers. +# number_of_servers: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_9_vson_clm.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_9_vson_clm.yaml new file mode 100644 index 0000000000..be81c5b4c2 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/module_9_vson_clm.yaml @@ -0,0 +1,148 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# + +description: The template deploys vSON VFC of type CLM. + +parameters: + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance. + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: OAM network subnet prefix length. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + availability_zone_0: + type: string + label: Availability zone 0 + description: Availability zone. + + vson_clm_server_group_id: + type: string + label: vSON Cluster Manager server group policy + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + The group intended for vSON Cluster Manager instances. + + vson_clm_name_0: + type: string + label: vSON Cluster Manager instance name + description: Unique name to be issued to the vSON Cluster Manager instance. + + vson_clm_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_clm_image_name: + type: string + label: vSON Cluster Manager VM image name + description: Image name the volume will be created from. + + vson_clm_oam_net_ip_0: + type: string + label: vSON CLM OAM network IP address + description: Fixed IP assignment for the vSON CLM instance on the OAM network. + + vson_clm_0_oam_net_ip_0: + type: string + label: vSON Cluster Manager 0 OAM net IP + description: IP of the first vSON Cluster Management server. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + + number_of_servers: + type: number + label: Number of Servers + description: Number of vSON Cluster Manager servers. + constraints: + - range: { min: 1, max: 2} + +resources: + + vson_clm_group: + type: OS::Heat::ResourceGroup + properties: + count: {get_param: number_of_servers} + resource_def: + type: nested_vson_server.yaml + properties: + instance_index: "%index%" + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vfc_role: clm + oam_net_id: {get_param: oam_net_id} + oam_net_subnet_prefix_length: {get_param: oam_net_subnet_prefix_length} + default_gateway: {get_param: default_gateway} + dns_servers: {get_param: dns_servers} + ntp_servers: {get_param: ntp_servers} + oam_net_security_group_id: {get_param: oam_net_security_group_id} + availability_zones: [{get_param: availability_zone_0}] + vson_server_group_id: {get_param: vson_clm_server_group_id} + vson_vm_names: [{get_param: vson_clm_name_0}] + oam_net_ips: [{get_param: vson_clm_oam_net_ip_0}] + vson_vm_flavor_name: {get_param: vson_clm_flavor_name} + vson_vm_image_name: {get_param: vson_clm_image_name} + vson_clm_oam_net_ip: {get_param: vson_clm_0_oam_net_ip_0} + vson_cluster_name: "" + swift_storage_url: "" + swift_account_auth_token: {get_param: swift_account_auth_token} + swift_son_container_name: "" + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml new file mode 100644 index 0000000000..7d8d5129d0 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml @@ -0,0 +1,205 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# +description: > + The template intended for deploying vSON VM instance. + +parameters: + + instance_index: + type: number + label: Instance Index + description: Index of the instance. + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance + + vfc_role: + type: string + label: VF module ID + description: Unique ID for this VF Module instance + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: Prefix length of the subnet on the OAM network. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + availability_zones: + type: comma_delimited_list + label: Availability zones + description: List of availability zones. + + vson_server_group_id: + type: string + label: vSON server group ID + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + + vson_vm_names: + type: comma_delimited_list + label: vSON Cluster leader names + description: A list of unique names to be issued to the vSON Cluster leaders. + + oam_net_ips: + type: comma_delimited_list + label: vSON OAM network IP addresses + description: Fixed IP assignments for vSON instances on the OAM network. + + vson_vm_image_name: + type: string + label: vSON base VM image name + description: VM Image name the vSON instance will be created from. + + vson_vm_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_cluster_name: + type: string + label: vSON Cluster name + description: Name of the vSON Cluster. + + vson_clm_oam_net_ip: + type: string + label: vSON Cluster Manager IP + description: IP of the vSON Cluster Manager. + + swift_storage_url: + type: string + label: swift storage URL + description: > + Swift storage URL. + Example: http://172.16.209.246:8080/v1/AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 + http://172.16.209.246:8080 - protocol, IP and port, + v1 - API version + AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 - account ID + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + + swift_son_container_name: + type: string + label: SON Swift + description: Swift container storing vSON artifacts. + +resources: + + wait_condition: + type: OS::Heat::SwiftSignal + properties: + handle: {get_resource: wait_handle} + count: 1 + timeout: 800 + + wait_handle: + type: OS::Heat::SwiftSignalHandle + +# vSON server OAM network port + vson_server_oam_net_port_0: + type: OS::Neutron::Port + properties: + name: + str_replace: + template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 + params: + VNF_NAME: {get_param: vnf_name} + VNF_ID: {get_param: vnf_id} + SERVER_NAME: {get_param: [vson_vm_names, {get_param: instance_index}]} + network_id: {get_param: oam_net_id} + fixed_ips: + - ip_address: {get_param: [oam_net_ips, {get_param: instance_index}]} + security_groups: + - {get_param: oam_net_security_group_id} + +# Create vSON server + vson_server: + type: OS::Nova::Server + depends_on: [vson_server_oam_net_port_0] + properties: + name: {get_param: [vson_vm_names, {get_param: instance_index}]} + availability_zone: {get_param: [availability_zones, {get_param: instance_index}]} + image: {get_param: vson_vm_image_name} + flavor: {get_param: vson_vm_flavor_name} + config_drive: True + metadata: + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vm_role: {get_param: vfc_role} + networks: + - port: {get_resource: vson_server_oam_net_port_0} + scheduler_hints: + group: {get_param: vson_server_group_id} + user_data_format: RAW + user_data: + str_replace: + template: {get_file: deploy.sh} + params: + $HOT_INSTANCE_INDEX: {get_param: instance_index} + $HOT_VFC_ROLE: {get_param: vfc_role} + $HOT_CLM_SERVER_IP: {get_param: vson_clm_oam_net_ip} + $HOT_THIS_INSTANCE_OAM_NET_IP: {get_param: [oam_net_ips, {get_param: instance_index}]} + $HOT_THIS_INSTANCE_OAM_NET_PREFIX: {get_param: oam_net_subnet_prefix_length} + $HOT_THIS_INSTANCE_DEFAULT_GATEWAY: {get_param: default_gateway} + $HOT_DNS_SERVERS: {list_join: [',', {get_param: dns_servers}]} + $HOT_NTP_SERVERS: {list_join: [' ', {get_param: ntp_servers}]} + $HOT_SWIFT_AUTH_TOKEN: {get_param: swift_account_auth_token} + $HOT_CLUSTER_NAME: {get_param: vson_cluster_name} + $HOT_SWIFT_STORAGE_URL: {get_param: swift_storage_url} + $HOT_SWIFT_CONTAINER_NAME: {get_param: swift_son_container_name} + $HOT_WC_NOTIFY: { get_attr: ['wait_handle', 'curl_cli'] } + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml new file mode 100644 index 0000000000..93f0fe7420 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml @@ -0,0 +1,192 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# +description: > + The template intended for deploying vSON VM instance + that's supposed to be booted from a Cinder volume. + +parameters: + + instance_index: + type: number + label: Instance Index + description: Index of the instance. + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance + + vfc_role: + type: string + label: VF module ID + description: Unique ID for this VF Module instance + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: Prefix length of the subnet on the OAM network. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + volume_ids: + type: comma_delimited_list + label: Volumes IDs + description: List of Volumes IDs. + + availability_zones: + type: comma_delimited_list + label: Availability zones + description: List of availability zones. + + vson_server_group_id: + type: string + label: vSON server group ID + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + + vson_vm_names: + type: comma_delimited_list + label: vSON Cluster leader names + description: A list of unique names to be issued to the vSON Cluster leaders. + + oam_net_ips: + type: comma_delimited_list + label: vSON OAM network IP addresses + description: Fixed IP assignments for vSON instances on the OAM network. + + vson_vm_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_dc_unit: + type: string + label: vSON Data Center name + description: Name of the vSON Data Center. + + vson_clm_oam_net_ip: + type: string + label: vSON Cluster Manager IP + description: IP of the vSON Cluster Manager. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + +resources: + + wait_condition: + type: OS::Heat::SwiftSignal + properties: + handle: {get_resource: wait_handle} + count: 1 + timeout: 800 + + wait_handle: + type: OS::Heat::SwiftSignalHandle + +# vSON server OAM network port + vson_server_oam_net_port_0: + type: OS::Neutron::Port + properties: + name: + str_replace: + template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 + params: + VNF_NAME: {get_param: vnf_name} + VNF_ID: {get_param: vnf_id} + SERVER_NAME: {get_param: [vson_vm_names, {get_param: instance_index}]} + network_id: {get_param: oam_net_id} + fixed_ips: + - ip_address: {get_param: [oam_net_ips, {get_param: instance_index}]} + security_groups: + - {get_param: oam_net_security_group_id} + +# Create vSON server + vson_server: + type: OS::Nova::Server + depends_on: [vson_server_oam_net_port_0] + properties: + name: {get_param: [vson_vm_names, {get_param: instance_index}]} + block_device_mapping_v2: + - device_name: "vda" + volume_id: {get_param: [volume_ids, {get_param: instance_index}]} + delete_on_termination: False + availability_zone: {get_param: [availability_zones, {get_param: instance_index}]} + flavor: {get_param: vson_vm_flavor_name} + config_drive: True + metadata: + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vm_role: {get_param: vfc_role} + networks: + - port: {get_resource: vson_server_oam_net_port_0} + scheduler_hints: + group: {get_param: vson_server_group_id} + user_data_format: RAW + user_data: + str_replace: + template: {get_file: deploy.sh} + params: + $HOT_INSTANCE_INDEX: {get_param: instance_index} + $HOT_VFC_ROLE: {get_param: vfc_role} + $HOT_CLM_SERVER_IP: {get_param: vson_clm_oam_net_ip} + $HOT_THIS_INSTANCE_OAM_NET_IP: {get_param: [oam_net_ips, {get_param: instance_index}]} + $HOT_THIS_INSTANCE_OAM_NET_PREFIX: {get_param: oam_net_subnet_prefix_length} + $HOT_THIS_INSTANCE_DEFAULT_GATEWAY: {get_param: default_gateway} + $HOT_DNS_SERVERS: {list_join: [',', {get_param: dns_servers}]} + $HOT_DC_NAME: {get_param: vson_dc_unit} + $HOT_NTP_SERVERS: {list_join: [' ', {get_param: ntp_servers}]} + $HOT_SWIFT_AUTH_TOKEN: {get_param: swift_account_auth_token} + $HOT_WC_NOTIFY: { get_attr: ['wait_handle', 'curl_cli'] } + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml new file mode 100644 index 0000000000..84cf6a783a --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml @@ -0,0 +1,211 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# +description: > + The template intended for deploying vSON VM instance. + +parameters: + + instance_index: + type: number + label: Instance Index + description: Index of the instance. + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance + + vfc_role: + type: string + label: VF module ID + description: Unique ID for this VF Module instance + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: Prefix length of the subnet on the OAM network. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + volume_ids: + type: comma_delimited_list + label: Volumes IDs + description: List of Volumes IDs. + + availability_zones: + type: comma_delimited_list + label: Availability zones + description: List of availability zones. + + vson_server_group_id: + type: string + label: vSON server group ID + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + + vson_vm_names: + type: comma_delimited_list + label: vSON Cluster leader names + description: A list of unique names to be issued to the vSON Cluster leaders. + + oam_net_ips: + type: comma_delimited_list + label: vSON OAM network IP addresses + description: Fixed IP assignments for vSON instances on the OAM network. + + vson_vm_image_name: + type: string + label: vSON base VM image name + description: VM Image name the vSON instance will be created from. + + vson_vm_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_dc_unit: + type: string + label: vSON Data Center name + description: Name of the vSON Data Center. + + vson_clm_oam_net_ip: + type: string + label: vSON Cluster Manager IP + description: IP of the vSON Cluster Manager. + + vson_join_cluster_auth_token: + type: string + label: vSON join cluster auth token + description: > + Authentication Token generated for the user permitted to add + a new Datacenter/vSON member to existing vSON Cluster. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + +resources: + + wait_condition: + type: OS::Heat::SwiftSignal + properties: + handle: {get_resource: wait_handle} + count: 1 + timeout: 800 + + wait_handle: + type: OS::Heat::SwiftSignalHandle + +# vSON server OAM network port + vson_server_oam_net_port_0: + type: OS::Neutron::Port + properties: + name: + str_replace: + template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 + params: + VNF_NAME: {get_param: vnf_name} + VNF_ID: {get_param: vnf_id} + SERVER_NAME: {get_param: [vson_vm_names, {get_param: instance_index}]} + network_id: {get_param: oam_net_id} + fixed_ips: + - ip_address: {get_param: [oam_net_ips, {get_param: instance_index}]} + security_groups: + - {get_param: oam_net_security_group_id} + +# Attach Cinder volume to the server + vson_server_volume_attach: + type: OS::Cinder::VolumeAttachment + depends_on: vson_server + properties: + instance_uuid: {get_resource: vson_server} + volume_id: {get_param: [volume_ids, {get_param: instance_index}]} + +# Create vSON server + vson_server: + type: OS::Nova::Server + depends_on: [vson_server_oam_net_port_0] + properties: + name: {get_param: [vson_vm_names, {get_param: instance_index}]} + availability_zone: {get_param: [availability_zones, {get_param: instance_index}]} + image: {get_param: vson_vm_image_name} + flavor: {get_param: vson_vm_flavor_name} + config_drive: True + metadata: + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vm_role: {get_param: vfc_role} + networks: + - port: {get_resource: vson_server_oam_net_port_0} + scheduler_hints: + group: {get_param: vson_server_group_id} + user_data_format: RAW + user_data: + str_replace: + template: {get_file: deploy.sh} + params: + $HOT_INSTANCE_INDEX: {get_param: instance_index} + $HOT_VOLUME_ID: {get_param: [volume_ids, {get_param: instance_index}]} + $HOT_VOLUME_ATTACH: "False" + $HOT_VFC_ROLE: {get_param: vfc_role} + $HOT_CLM_SERVER_IP: {get_param: vson_clm_oam_net_ip} + $HOT_THIS_INSTANCE_OAM_NET_IP: {get_param: [oam_net_ips, {get_param: instance_index}]} + $HOT_THIS_INSTANCE_OAM_NET_PREFIX: {get_param: oam_net_subnet_prefix_length} + $HOT_THIS_INSTANCE_DEFAULT_GATEWAY: {get_param: default_gateway} + $HOT_DNS_SERVERS: {list_join: [',', {get_param: dns_servers}]} + $HOT_DC_NAME: {get_param: vson_dc_unit} + $HOT_NTP_SERVERS: {list_join: [' ', {get_param: ntp_servers}]} + $HOT_SWIFT_AUTH_TOKEN: {get_param: swift_account_auth_token} + $HOT_VSON_JOIN_CLUSTER_AUTH_TOKEN: {get_param: vson_join_cluster_auth_token} + $HOT_WC_NOTIFY: { get_attr: ['wait_handle', 'curl_cli'] } + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol_dual_ip_stack.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol_dual_ip_stack.yaml new file mode 100644 index 0000000000..fa607d3c24 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol_dual_ip_stack.yaml @@ -0,0 +1,229 @@ +heat_template_version: 2015-04-30 +################################# +# Author: Dmitry Orzhehovsky +# Email: dorzheho@cisco.com +################################# +description: > + The template intended for deploying vSON VM instance. + +parameters: + + instance_index: + type: number + label: Instance Index + description: Index of the instance. + + vnf_name: + type: string + label: VF name + description: Unique name for this VF instance. + + vnf_id: + type: string + label: VF ID + description: Unique ID for this VF instance. + + vf_module_name: + type: string + label: VF module name + description: Unique name for this VF module instance. + + vf_module_id: + type: string + label: VF module ID + description: Unique ID for this VF Module instance + + vfc_role: + type: string + label: VF module ID + description: Unique ID for this VF Module instance + + oam_net_id: + type: string + label: OAM network ID + description: The ID of the OAM network. + + oam_net_subnet_prefix_length: + type: string + label: OAM net subnet prefix length + description: Prefix length of the subnet on the OAM network. + + oam_net_subnet_v6_prefix_length: + type: string + label: OAM net IPv6 subnet prefix length + description: OAM network IPv6 subnet prefix length. + + default_gateway: + type: string + label: Default gateway + description: Default gateway. + + default_gateway_v6: + type: string + label: Default IPv6 gateway + description: Default IPv6 gateway. + + dns_servers: + type: comma_delimited_list + label: DNS servers + description: List of DNS servers. + + ntp_servers: + type: comma_delimited_list + label: NTP servers + description: List of NTP servers. + + oam_net_security_group_id: + type: string + label: OAM network security group ID + description: > + The ID of Security group applied on the port + bound to the vSON OAM network. + + volume_ids: + type: comma_delimited_list + label: Volumes IDs + description: List of Volumes IDs. + + availability_zones: + type: comma_delimited_list + label: Availability zones + description: List of availability zones. + + vson_server_group_id: + type: string + label: vSON server group ID + description: > + Tells what policy should be applied to the ServerGroup. + Affinity policy will force instances to share the same hypervisor. + Anti-affinity will force instances to run in different hypervisors. + + vson_vm_names: + type: comma_delimited_list + label: vSON Cluster leader names + description: A list of unique names to be issued to the vSON Cluster leaders. + + oam_net_ips: + type: comma_delimited_list + label: vSON OAM network IPv4 addresses + description: Fixed IPv4 assignments for vSON instances on the OAM network. + + oam_net_v6_ips: + type: comma_delimited_list + label: vSON OAM network IPv6 addresses + description: Fixed IPv6 assignments for vSON instances on the OAM network. + + vson_vm_image_name: + type: string + label: vSON base VM image name + description: VM Image name the vSON instance will be created from. + + vson_vm_flavor_name: + type: string + label: Flavor name + description: The ID or name of the flavor to boot onto. + + vson_dc_unit: + type: string + label: vSON Data Center name + description: Name of the vSON Data Center. + + vson_clm_oam_net_ip: + type: string + label: vSON Cluster Manager IP + description: IP of the vSON Cluster Manager. + + vson_join_cluster_auth_token: + type: string + label: vSON join cluster auth token + description: > + Authentication Token generated for the user permitted to add + a new Datacenter/vSON member to existing vSON Cluster. + + swift_account_auth_token: + type: string + label: Swift account auth token + description: > + Swift account auth token. + Example: 041a5187bb4641f9b89583e2539776b0 + +resources: + + wait_condition: + type: OS::Heat::SwiftSignal + properties: + handle: {get_resource: wait_handle} + count: 1 + timeout: 800 + + wait_handle: + type: OS::Heat::SwiftSignalHandle + +# vSON server OAM network port + vson_server_oam_net_port_0: + type: OS::Neutron::Port + properties: + name: + str_replace: + template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 + params: + VNF_NAME: {get_param: vnf_name} + VNF_ID: {get_param: vnf_id} + SERVER_NAME: {get_param: [vson_vm_names, {get_param: instance_index}]} + network_id: {get_param: oam_net_id} + fixed_ips: + - ip_address: {get_param: [oam_net_ips, {get_param: instance_index}]} + - ip_address: {get_param: [oam_net_v6_ips, {get_param: instance_index}]} + security_groups: + - {get_param: oam_net_security_group_id} + +# Attach Cinder volume to the server + vson_server_volume_attach: + type: OS::Cinder::VolumeAttachment + depends_on: vson_server + properties: + instance_uuid: {get_resource: vson_server} + volume_id: {get_param: [volume_ids, {get_param: instance_index}]} + +# Create vSON server + vson_server: + type: OS::Nova::Server + depends_on: [vson_server_oam_net_port_0] + properties: + name: {get_param: [vson_vm_names, {get_param: instance_index}]} + availability_zone: {get_param: [availability_zones, {get_param: instance_index}]} + image: {get_param: vson_vm_image_name} + flavor: {get_param: vson_vm_flavor_name} + config_drive: True + metadata: + vnf_name: {get_param: vnf_name} + vnf_id: {get_param: vnf_id} + vf_module_name: {get_param: vf_module_name} + vf_module_id: {get_param: vf_module_id} + vm_role: {get_param: vfc_role} + networks: + - port: {get_resource: vson_server_oam_net_port_0} + scheduler_hints: + group: {get_param: vson_server_group_id} + user_data_format: RAW + user_data: + str_replace: + template: {get_file: deploy.sh} + params: + $HOT_INSTANCE_INDEX: {get_param: instance_index} + $HOT_VOLUME_ID: {get_param: [volume_ids, {get_param: instance_index}]} + $HOT_VOLUME_ATTACH: "False" + $HOT_VFC_ROLE: {get_param: vfc_role} + $HOT_CLM_SERVER_IP: {get_param: vson_clm_oam_net_ip} + $HOT_THIS_INSTANCE_OAM_NET_IP: {get_param: [oam_net_ips, {get_param: instance_index}]} + $HOT_THIS_INSTANCE_OAM_NET_PREFIX: {get_param: oam_net_subnet_prefix_length} + $HOT_THIS_INSTANCE_OAM_V6_NET_IP: {get_param: [oam_net_v6_ips, {get_param: instance_index}]} + $HOT_THIS_INSTANCE_OAM_V6_NET_PREFIX: {get_param: oam_net_subnet_v6_prefix_length} + $HOT_THIS_INSTANCE_DEFAULT_GATEWAY: {get_param: default_gateway} + $HOT_THIS_INSTANCE_DEFAULT_GATEWAY_V6: {get_param: default_gateway_v6} + $HOT_DNS_SERVERS: {list_join: [',', {get_param: dns_servers}]} + $HOT_DC_NAME: {get_param: vson_dc_unit} + $HOT_NTP_SERVERS: {list_join: [' ', {get_param: ntp_servers}]} + $HOT_SWIFT_AUTH_TOKEN: {get_param: swift_account_auth_token} + $HOT_VSON_JOIN_CLUSTER_AUTH_TOKEN: {get_param: vson_join_cluster_auth_token} + $HOT_WC_NOTIFY: { get_attr: ['wait_handle', 'curl_cli'] } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml new file mode 100644 index 0000000000..713591db2f --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -0,0 +1,2040 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: GlobalSubstitutionTypes +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.abstract.nodes.heat.vson_vm_2: + derived_from: org.openecomp.resource.abstract.nodes.VFC + properties: + vf_module_id: + type: string + description: Unique ID for this VF Module instance + required: true + status: SUPPORTED + default_gateway: + type: string + description: Default gateway. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + instance_index: + type: float + description: Index of the instance. + required: true + status: SUPPORTED + vnf_name: + type: string + description: Unique name for this VF instance. + required: true + status: SUPPORTED + oam_net_subnet_prefix_length: + type: string + description: Prefix length of the subnet on the OAM network. + required: true + status: SUPPORTED + vf_module_name: + type: string + description: Unique name for this VF module instance. + required: true + status: SUPPORTED + dns_servers: + type: list + description: List of DNS servers. + required: true + status: SUPPORTED + entry_schema: &id001 + type: string + oam_net_security_group_id: + type: string + description: | + The ID of Security group applied on the port bound to the vSON OAM network. + required: true + status: SUPPORTED + vson_vm_image_name: + type: string + description: VM Image name the vSON instance will be created from. + required: true + status: SUPPORTED + vnf_id: + type: string + description: Unique ID for this VF instance. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_network_role: + type: string + required: true + status: SUPPORTED + vson_clm_oam_net_ip: + type: string + description: IP of the vSON Cluster Manager. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + vson_dc_unit: + type: string + description: Name of the vSON Data Center. + required: true + status: SUPPORTED + oam_net_ips: + type: list + description: Fixed IP assignments for vSON instances on the OAM network. + required: true + status: SUPPORTED + entry_schema: &id002 + type: string + vfc_role: + type: string + description: Unique ID for this VF Module instance + required: true + status: SUPPORTED + swift_account_auth_token: + type: string + description: | + Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 + required: true + status: SUPPORTED + vson_server_group_id: + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. + required: true + status: SUPPORTED + vson_vm_flavor_name: + type: string + description: The ID or name of the flavor to boot onto. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + availability_zones: + type: list + description: List of availability zones. + required: true + status: SUPPORTED + entry_schema: &id003 + type: string + volume_ids: + type: list + description: List of Volumes IDs. + required: true + status: SUPPORTED + entry_schema: &id004 + type: string + ntp_servers: + type: list + description: List of NTP servers. + required: true + status: SUPPORTED + entry_schema: &id005 + type: string + vson_join_cluster_auth_token: + type: string + description: "Authentication Token generated for the user permitted to add\ + \ a new Datacenter/vSON member to existing vSON Cluster. \n" + required: true + status: SUPPORTED + oam_net_id: + type: string + description: The ID of the OAM network. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_order: + type: integer + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vson_vm_names: + type: list + description: A list of unique names to be issued to the vSON Cluster leaders. + required: true + status: SUPPORTED + entry_schema: &id006 + type: string + requirements: + - dependency_vson_server: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_vson_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vson_server_oam_net_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vson_server_oam_net_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + disk.write.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_vson_server: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + feature_vson_server_oam_net_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + instance_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_vson_server_oam_net_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.iops_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_vson_server: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + vcpus_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_vson_server: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vson_server: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.allocation_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_vson_server: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + host_vson_server: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + binding_vson_server_oam_net_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.bytes.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + org.openecomp.resource.abstract.nodes.heat.vson_vm: + derived_from: org.openecomp.resource.abstract.nodes.VFC + properties: + vf_module_id: + type: string + description: Unique ID for this VF Module instance + required: true + status: SUPPORTED + default_gateway: + type: string + description: Default gateway. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + instance_index: + type: float + description: Index of the instance. + required: true + status: SUPPORTED + vnf_name: + type: string + description: Unique name for this VF instance. + required: true + status: SUPPORTED + oam_net_subnet_prefix_length: + type: string + description: Prefix length of the subnet on the OAM network. + required: true + status: SUPPORTED + vf_module_name: + type: string + description: Unique name for this VF module instance. + required: true + status: SUPPORTED + dns_servers: + type: list + description: List of DNS servers. + required: true + status: SUPPORTED + entry_schema: + type: string + oam_net_security_group_id: + type: string + description: | + The ID of Security group applied on the port bound to the vSON OAM network. + required: true + status: SUPPORTED + vson_vm_image_name: + type: string + description: VM Image name the vSON instance will be created from. + required: true + status: SUPPORTED + vnf_id: + type: string + description: Unique ID for this VF instance. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_network_role: + type: string + required: true + status: SUPPORTED + vson_clm_oam_net_ip: + type: string + description: IP of the vSON Cluster Manager. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + vson_dc_unit: + type: string + description: Name of the vSON Data Center. + required: true + status: SUPPORTED + oam_net_ips: + type: list + description: Fixed IPv4 assignments for vSON instances on the OAM network. + required: true + status: SUPPORTED + entry_schema: + type: string + oam_net_subnet_v6_prefix_length: + type: string + description: OAM network IPv6 subnet prefix length. + required: true + status: SUPPORTED + vfc_role: + type: string + description: Unique ID for this VF Module instance + required: true + status: SUPPORTED + swift_account_auth_token: + type: string + description: | + Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 + required: true + status: SUPPORTED + default_gateway_v6: + type: string + description: Default IPv6 gateway. + required: true + status: SUPPORTED + vson_server_group_id: + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. + required: true + status: SUPPORTED + vson_vm_flavor_name: + type: string + description: The ID or name of the flavor to boot onto. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + availability_zones: + type: list + description: List of availability zones. + required: true + status: SUPPORTED + entry_schema: + type: string + volume_ids: + type: list + description: List of Volumes IDs. + required: true + status: SUPPORTED + entry_schema: + type: string + oam_net_v6_ips: + type: list + description: Fixed IPv6 assignments for vSON instances on the OAM network. + required: true + status: SUPPORTED + entry_schema: + type: string + ntp_servers: + type: list + description: List of NTP servers. + required: true + status: SUPPORTED + entry_schema: + type: string + vson_join_cluster_auth_token: + type: string + description: | + Authentication Token generated for the user permitted to add a new Datacenter/vSON member to existing vSON Cluster. + required: true + status: SUPPORTED + oam_net_id: + type: string + description: The ID of the OAM network. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_order: + type: integer + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vson_vm_names: + type: list + description: A list of unique names to be issued to the vSON Cluster leaders. + required: true + status: SUPPORTED + entry_schema: + type: string + requirements: + - dependency_vson_server: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_vson_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vson_server_oam_net_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vson_server_oam_net_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + disk.write.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_vson_server: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + feature_vson_server_oam_net_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + instance_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_vson_server_oam_net_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.iops_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_vson_server: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + vcpus_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_vson_server: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vson_server: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.allocation_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_vson_server: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + host_vson_server: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + binding_vson_server_oam_net_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.bytes.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + org.openecomp.resource.abstract.nodes.heat.vson_vm_3: + derived_from: org.openecomp.resource.abstract.nodes.VFC + properties: + vf_module_id: + type: string + description: Unique ID for this VF Module instance + required: true + status: SUPPORTED + vson_cluster_name: + type: string + description: Name of the vSON Cluster. + required: true + status: SUPPORTED + default_gateway: + type: string + description: Default gateway. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + instance_index: + type: float + description: Index of the instance. + required: true + status: SUPPORTED + vnf_name: + type: string + description: Unique name for this VF instance. + required: true + status: SUPPORTED + oam_net_subnet_prefix_length: + type: string + description: Prefix length of the subnet on the OAM network. + required: true + status: SUPPORTED + swift_storage_url: + type: string + description: | + Swift storage URL. Example: http://172.16.209.246:8080/v1/AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 http://172.16.209.246:8080 - protocol, IP and port, v1 - API version AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 - account ID + required: true + status: SUPPORTED + vf_module_name: + type: string + description: Unique name for this VF module instance. + required: true + status: SUPPORTED + dns_servers: + type: list + description: List of DNS servers. + required: true + status: SUPPORTED + entry_schema: + type: string + oam_net_security_group_id: + type: string + description: | + The ID of Security group applied on the port bound to the vSON OAM network. + required: true + status: SUPPORTED + vson_vm_image_name: + type: string + description: VM Image name the vSON instance will be created from. + required: true + status: SUPPORTED + vnf_id: + type: string + description: Unique ID for this VF instance. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_network_role: + type: string + required: true + status: SUPPORTED + vson_clm_oam_net_ip: + type: string + description: IP of the vSON Cluster Manager. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + oam_net_ips: + type: list + description: Fixed IP assignments for vSON instances on the OAM network. + required: true + status: SUPPORTED + entry_schema: + type: string + swift_son_container_name: + type: string + description: Swift container storing vSON artifacts. + required: true + status: SUPPORTED + vfc_role: + type: string + description: Unique ID for this VF Module instance + required: true + status: SUPPORTED + swift_account_auth_token: + type: string + description: | + Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 + required: true + status: SUPPORTED + vson_server_group_id: + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. + required: true + status: SUPPORTED + vson_vm_flavor_name: + type: string + description: The ID or name of the flavor to boot onto. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + availability_zones: + type: list + description: List of availability zones. + required: true + status: SUPPORTED + entry_schema: + type: string + ntp_servers: + type: list + description: List of NTP servers. + required: true + status: SUPPORTED + entry_schema: + type: string + oam_net_id: + type: string + description: The ID of the OAM network. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_order: + type: integer + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vson_vm_names: + type: list + description: A list of unique names to be issued to the vSON Cluster leaders. + required: true + status: SUPPORTED + entry_schema: + type: string + requirements: + - dependency_vson_server: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_vson_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vson_server_oam_net_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vson_server_oam_net_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + disk.write.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_vson_server: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + feature_vson_server_oam_net_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + instance_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_vson_server_oam_net_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.iops_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_vson_server: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + vcpus_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_vson_server: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vson_server: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.allocation_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_vson_server: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + host_vson_server: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + binding_vson_server_oam_net_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.bytes.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + org.openecomp.resource.abstract.nodes.heat.vson_vm_1: + derived_from: org.openecomp.resource.abstract.nodes.VFC + properties: + vf_module_id: + type: string + description: Unique ID for this VF Module instance + required: true + status: SUPPORTED + default_gateway: + type: string + description: Default gateway. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + instance_index: + type: float + description: Index of the instance. + required: true + status: SUPPORTED + vnf_name: + type: string + description: Unique name for this VF instance. + required: true + status: SUPPORTED + oam_net_subnet_prefix_length: + type: string + description: Prefix length of the subnet on the OAM network. + required: true + status: SUPPORTED + vf_module_name: + type: string + description: Unique name for this VF module instance. + required: true + status: SUPPORTED + dns_servers: + type: list + description: List of DNS servers. + required: true + status: SUPPORTED + entry_schema: *id001 + oam_net_security_group_id: + type: string + description: | + The ID of Security group applied on the port bound to the vSON OAM network. + required: true + status: SUPPORTED + vson_vm_image_name: + type: string + description: VM Image name the vSON instance will be created from. + required: true + status: SUPPORTED + vnf_id: + type: string + description: Unique ID for this VF instance. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_network_role: + type: string + required: true + status: SUPPORTED + vson_clm_oam_net_ip: + type: string + description: IP of the vSON Cluster Manager. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + vson_dc_unit: + type: string + description: Name of the vSON Data Center. + required: true + status: SUPPORTED + oam_net_ips: + type: list + description: Fixed IP assignments for vSON instances on the OAM network. + required: true + status: SUPPORTED + entry_schema: *id002 + vfc_role: + type: string + description: Unique ID for this VF Module instance + required: true + status: SUPPORTED + swift_account_auth_token: + type: string + description: | + Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 + required: true + status: SUPPORTED + vson_server_group_id: + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. + required: true + status: SUPPORTED + vson_vm_flavor_name: + type: string + description: The ID or name of the flavor to boot onto. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + availability_zones: + type: list + description: List of availability zones. + required: true + status: SUPPORTED + entry_schema: *id003 + volume_ids: + type: list + description: List of Volumes IDs. + required: true + status: SUPPORTED + entry_schema: *id004 + ntp_servers: + type: list + description: List of NTP servers. + required: true + status: SUPPORTED + entry_schema: *id005 + vson_join_cluster_auth_token: + type: string + description: "Authentication Token generated for the user permitted to add\ + \ a new Datacenter/vSON member to existing vSON Cluster. \n" + required: true + status: SUPPORTED + oam_net_id: + type: string + description: The ID of the OAM network. + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_order: + type: integer + required: true + status: SUPPORTED + port_vson_server_oam_net_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vson_vm_names: + type: list + description: A list of unique names to be issued to the vSON Cluster leaders. + required: true + status: SUPPORTED + entry_schema: *id006 + requirements: + - dependency_vson_server: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_vson_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vson_server_oam_net_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vson_server_oam_net_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + disk.write.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_vson_server: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + feature_vson_server_oam_net_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + instance_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_vson_server_oam_net_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.iops_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_vson_server: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + vcpus_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_vson_server: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vson_server: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.allocation_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_vson_server: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + host_vson_server: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + binding_vson_server_oam_net_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.bytes.rate_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_vson_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml new file mode 100644 index 0000000000..881506c874 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml @@ -0,0 +1,1771 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + vson_app_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + default: vson-app-flavor + vson_dbg_volume_id_0: + label: vSON DBG Volume ID 0 + hidden: false + immutable: false + type: string + description: Volume ID of the vSON DBG server. + vson_dbs_server_group_id: + label: vSON DBS server group policy + hidden: false + immutable: false + type: string + description: "Tells what policy should be applied to the ServerGroup. Affinity\ + \ policy will force instances to share the same hypervisor. Anti-affinity\ + \ will force instances to run in different hypervisors. The group intended\ + \ for vSON DBS instances. \n" + vson_mon_volume_name_0: + label: vSON MON volume name + hidden: false + immutable: false + type: string + description: Volume name. + default: vson_mon_volume_0 + vson_dbs_volume_name_0: + label: vSON DBS volume name 0 + hidden: false + immutable: false + type: string + description: First volume name. + vson_dbs_volume_size_1: + label: vSON DBS volume ID 1 size + hidden: false + immutable: false + type: float + description: Size of the second Cinder volume. Measured in gigabytes. + default: 500 + vson_mdr_volume_id_0: + label: vSON Mediator Volume ID 0 + hidden: false + immutable: false + type: string + description: Volume ID of the vSON Mediator server. + vson_mgt_volume_name_0: + label: vSON MGT volume name + hidden: false + immutable: false + type: string + description: Volume name. + default: vson_mgt_volume_0 + vson_dbs_volume_name_1: + label: vSON DBS volume name 1 + hidden: false + immutable: false + type: string + description: Second volume name. + vson_dbs_volume_size_0: + label: vSON DBS volume ID 0 size + hidden: false + immutable: false + type: float + description: Size of the first Cinder volume. Measured in gigabytes. + default: 500 + vson_mon_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + vson_mon_volume_size_0: + label: vSON MON cinder volume size + hidden: false + immutable: false + type: float + description: Size of the Cinder volume. Measured in gigabytes. + default: 100 + vson_mon_image_name: + label: vSON MON VM image name + hidden: false + immutable: false + type: string + description: Image name the volume will be created from. + default: VSON-BASE-1.0 + oam_net_subnet_prefix_length: + label: OAM net subnet prefix length + hidden: false + immutable: false + type: string + description: OAM network subnet prefix length. + swift_storage_url: + label: swift storage URL + hidden: false + immutable: false + type: string + description: | + Swift storage URL. Example: http://172.16.209.246:8080/v1/AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 http://172.16.209.246:8080 - protocol, IP and port, v1 - API version AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 - account ID + vson_dcl_image_name: + label: vSON base VM image name + hidden: false + immutable: false + type: string + description: VM Image name the vSON DC leader instance will be created from. + vson_app_oam_net_v6_ip_0: + label: vSON APP OAM network IPv6 address + hidden: false + immutable: false + type: string + description: Fixed IPv6 assignment for the vSON APP instance on the OAM network. + dns_servers: + label: DNS servers + hidden: false + immutable: false + type: list + description: List of DNS servers. + entry_schema: + type: string + vson_app_volume_size_0: + label: vSON APP cinder volume size + hidden: false + immutable: false + type: float + description: | + Size of the Cinder volume. Measured in gigabytes. + default: 200 + oam_net_security_group_id: + label: OAM network security group ID + hidden: false + immutable: false + type: string + description: | + The ID of Security group applied on the port bound to the vSON OAM network. + vson_mgt_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + default: vson-mgt-flavor + vson_mgt_volume_size_0: + label: vSON MGT cinder volume size + hidden: false + immutable: false + type: float + description: Size of the Cinder volume. Measured in gigabytes. + default: 100 + vson_dbs_volume_id_0: + label: vSON DBS Volume ID 0 + hidden: false + immutable: false + type: string + description: Volume ID of the first vSON DBS server. + vson_dbc_volume_id_0: + label: vSON DBC Volume ID 0 + hidden: false + immutable: false + type: string + description: Volume ID of the vSON DBC server. + vson_dbs_volume_id_1: + label: vSON DBS Volume ID 1 + hidden: false + immutable: false + type: string + description: Volume ID of the second vSON DBS server. + vson_dbc_image_name: + label: vSON base VM image name + hidden: false + immutable: false + type: string + description: VM Image name the vSON DBC instance will be created from. + default: VSON-BASE-1.0 + vson_mgt_image_name: + label: vSON Management VM image name + hidden: false + immutable: false + type: string + description: Image name the volume will be created from. + default: VSON-BASE-1.0 + default_gateway_v6: + label: Default IPv6 gateway + hidden: false + immutable: false + type: string + description: Default IPv6 gateway. + vson_mgt_server_group_id: + label: vSON Management server group policy + hidden: false + immutable: false + type: string + description: "Tells what policy should be applied to the ServerGroup. Affinity\ + \ policy will force instances to share the same hypervisor. Anti-affinity\ + \ will force instances to run in different hypervisors. The group intended\ + \ for vSON Management instances. \n" + vson_clm_name_0: + label: vSON Cluster Manager instance name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the vSON Cluster Manager instance. + vson_dbc_server_group_policy: + label: vSON Database server group policy + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Database instances. + default: anti-affinity + vson_clm_server_group_policy: + label: vSON Cluster Management server group policy + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Cluster Management instances. + default: anti-affinity + vson_mon_server_group_policy: + label: vSON MON server group policy + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON MON instances. + default: anti-affinity + vson_dbg_server_group_id: + label: vSON DBS server group policy + hidden: false + immutable: false + type: string + description: "Tells what policy should be applied to the ServerGroup. Affinity\ + \ policy will force instances to share the same hypervisor. Anti-affinity\ + \ will force instances to run in different hypervisors. The group intended\ + \ for vSON DBS instances. \n" + vson_leader_server_group_policy: + label: vSON Cluster/DC leader server group policy + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Cluster/DC leader instances. + default: anti-affinity + vson_dcl_oam_net_ip_0: + label: vSON DC leader OAM network IP address 0 + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the first vSON DC leader instance on the OAM network. + vson_cll_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + vson_app_server_group_policy: + label: vSON Application server group policy + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Application instances. + default: anti-affinity + vson_dcl_oam_net_ip_1: + label: vSON DC leader OAM network IP address 1 + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the second vSON DC leader instance on the OAM network. + vson_dcl_oam_net_ip_2: + label: vSON DC leader OAM network IP address 2 + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the third vSON DC leader instance on the OAM network. + vson_dbg_volume_size_0: + label: vSON DBG cinder volume size + hidden: false + immutable: false + type: float + description: | + Size of the Cinder volume. Measured in gigabytes. + default: 200 + vson_cll_oam_net_ip_0: + label: vSON Cluster leader OAM network IP address 0 + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the first vSON Cluster leader instance on the OAM network. + vson_app_oam_net_ip_0: + label: vSON APP OAM network IPv4 address + hidden: false + immutable: false + type: string + description: Fixed IPv4 assignment for the vSON APP instance on the OAM network. + vson_cll_oam_net_ip_2: + label: vSON Cluster leader OAM network IP address 2 + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the third vSON Cluster leader instance on the OAM network. + vson_cll_oam_net_ip_1: + label: vSON Cluster leader OAM network IP address 1 + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the second vSON Cluster leader instance on the OAM network. + vson_clm_oam_net_ip_0: + label: vSON CLM OAM network IP address + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the vSON CLM instance on the OAM network. + default: 172.20.50.3 + vf_module_id: + label: VF module ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF Module instance. + vson_dbc_oam_net_ip_0: + label: vSON DBC OAM network IP address + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the vSON DBC instance on the OAM network. + vson_dbg_oam_net_ip_0: + label: vSON DBG OAM network IP address + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the vSON DBG instance on the OAM network. + vnf_name: + label: VF name + hidden: false + immutable: false + type: string + description: Unique name for this VF instance. + number_of_servers: + label: Number of Servers + hidden: false + immutable: false + type: float + description: Number of vSON Management servers. + constraints: + - in_range: + - 1 + - 1 + vson_mgt_name_0: + label: vSON Management instance name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the vSON Management instance. + default: vson-03.cisco.com + vf_module_name: + label: VF module name + hidden: false + immutable: false + type: string + description: Unique name for this VF module instance. + default: module_0_vson_mgt_volume + vson_clm_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + default: vson-clm-flavor + vson_mdr_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + default: vson-mdr-flavor + vson_mon_volume_id_0: + label: vSON MON Volume ID 0 + hidden: false + immutable: false + type: string + description: Volume ID of the vSON MON server. + availability_zone_0: + label: Availability zone 0 + hidden: false + immutable: false + type: string + description: Availability zone. + availability_zone_1: + label: Availability zone 1 + hidden: false + immutable: false + type: string + description: Second availability zone. + vson_dbc_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + default: vson-dbc-flavor + vson_dbc_volume_name_0: + label: vSON DBC volume name + hidden: false + immutable: false + type: string + description: Volume name. + vson_mdr_image_name: + label: vSON Mediator VM image name + hidden: false + immutable: false + type: string + description: Image name the volume will be created from. + vson_cll_name_0: + label: First vSON Cluster leader name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the first vSON Cluster leader. + vson_cll_image_name: + label: vSON base VM image name + hidden: false + immutable: false + type: string + description: VM Image name the vSON Cluster leader instance will be created from. + vson_cll_name_2: + label: Third vSON Cluster leader name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the third vSON Cluster leader. + vson_dbg_name_0: + label: vSON DBG name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the vSON DBG server. + vson_cll_name_1: + label: Second vSON Cluster leader name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the second vSON Cluster leader. + vson_dbs_server_group_policy: + label: vSON Database server group policy + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON DB Shard instances. + default: anti-affinity + vson_join_cluster_auth_token: + label: vSON join cluster auth token + hidden: false + immutable: false + type: string + description: "Authentication Token generated for the user permitted to add \ + \ a new vSON Datacenter. \n" + vson_dcl_name_0: + label: First vSON DC leader name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the first vSON DC leader. + vson_dcl_name_1: + label: Second vSON DC leader name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the second vSON DC leader. + vson_clm_0_oam_net_ip_0: + label: vSON Cluster Manager 0 OAM net IP + hidden: false + immutable: false + type: string + description: IP of the first vSON Cluster Management server. + vson_dcl_name_2: + label: Third vSON DC leader name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the third vSON DC leader. + oam_net_id: + label: OAM network ID + hidden: false + immutable: false + type: string + description: The ID of the OAM network. + vson_mon_oam_net_ip_0: + label: vSON MON OAM network IP address + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the vSON MON instance on the OAM network. + vson_dbg_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + default: vson-dbg-flavor + vson_clm_image_name: + label: vSON Cluster Manager VM image name + hidden: false + immutable: false + type: string + description: Image name the volume will be created from. + default: VSON-BASE-1.0 + vson_dbc_name_0: + label: vSON DBC name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the vSON DBC server. + vson_dbs_oam_net_ip_1: + label: vSON DBS OAM network IP address 1 + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the second vSON DBS instance on the OAM network. + vson_dbg_image_name: + label: vSON base VM image name + hidden: false + immutable: false + type: string + description: VM Image name the vSON DBG instance will be created from. + default: VSON-BASE-1.0 + vson_mgt_oam_net_ip_0: + label: vSON MGT OAM network IP address + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the vSON MGT instance on the OAM network. + vson_dbs_oam_net_ip_0: + label: vSON DBS OAM network IP address 0 + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the first vSON DBS instance on the OAM network. + vson_cluster_name: + label: vSON Cluster name + hidden: false + immutable: false + type: string + description: Name of the vSON Cluster. + constraints: + - max_length: 13 + - min_length: 1 + vson_dcl_volume_size_1: + label: Cinder volume ID 1 size + hidden: false + immutable: false + type: float + description: | + Size of the second Cinder volume. Measured in gigabytes. + default: 200 + vson_dcl_volume_size_0: + label: Cinder volume ID 0 size + hidden: false + immutable: false + type: float + description: | + Size of the first Cinder volume. Measured in gigabytes. + default: 200 + vson_dcl_volume_size_2: + label: Cinder volume ID 2 size + hidden: false + immutable: false + type: float + description: | + Size of the third Cinder volume. Measured in gigabytes. + default: 200 + vson_dbs_name_0: + label: First vSON DBS name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the first vSON DBS server. + vson_dbs_name_1: + label: Second vSON DBS name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the second vSON DBS server. + vson_mdr_server_group_id: + label: vSON Mediator server group policy + hidden: false + immutable: false + type: string + description: "Tells what policy should be applied to the ServerGroup. Affinity\ + \ policy will force instances to share the same hypervisor. Anti-affinity\ + \ will force instances to run in different hypervisors. The group intended\ + \ for vSON Mediator instances. \n" + vson_dbc_server_group_id: + label: vSON DBS server group policy + hidden: false + immutable: false + type: string + description: "Tells what policy should be applied to the ServerGroup. Affinity\ + \ policy will force instances to share the same hypervisor. Anti-affinity\ + \ will force instances to run in different hypervisors. The group intended\ + \ for vSON DBS instances. \n" + vson_dbs_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + default: vson-dbs-flavor + vson_mdr_server_group_policy: + label: vSON Mediator server group policy + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Mediator instances. + default: anti-affinity + vson_dbc_volume_size_0: + label: vSON DBC cinder volume size + hidden: false + immutable: false + type: float + description: Size of the Cinder volume. Measured in gigabytes. + default: 50 + vson_app_name_0: + label: vSON APP instance name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the vSON APP instance. + default: vson-13.cisco.com + swift_account_auth_token: + label: Swift account auth token + hidden: false + immutable: false + type: string + description: | + Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 + vson_mdr_oam_net_ip_0: + label: vSON MDR OAM network IP address + hidden: false + immutable: false + type: string + description: Fixed IP assignment for the vSON MDR instance on the OAM network. + vson_leader_server_group_id: + label: vSON Cluster leader server group policy + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Cluster leaders. + vson_clm_server_group_id: + label: vSON Cluster Manager server group policy + hidden: false + immutable: false + type: string + description: "Tells what policy should be applied to the ServerGroup. Affinity\ + \ policy will force instances to share the same hypervisor. Anti-affinity\ + \ will force instances to run in different hypervisors. The group intended\ + \ for vSON Cluster Manager instances. \n" + vson_app_server_group_id: + label: vSON APP server group policy + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON APP instances. + vson_master_clm_ip: + label: vSON master CLM IP + hidden: false + immutable: false + type: string + description: "Master CLM IP. If the vSON Cluster belongs to a single OpenStack\ + \ tenant, the value SHOULD BE EMPTY. In case the vSON Cluster is distributed\ + \ between multiple tenants:\n -> vSON Cluster instantiation - the value should\ + \ be empty \n -> Adding a new DC to existing vSON Cluster - IP of the CLM\ + \ deployed during \n vSON Cluster instantiation, should be set as the\ + \ value. \n" + vson_dcl_volume_id_2: + label: vSON DC Leader Volume ID 2 + hidden: false + immutable: false + type: string + description: Volume ID of the third vSON DC leader. + vson_mgt_server_group_policy: + label: vSON Management server group policy + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Management instances. + default: anti-affinity + vson_dcl_volume_id_1: + label: vSON DC Leader Volume ID 1 + hidden: false + immutable: false + type: string + description: Volume ID of the second vSON DC leader. + vson_dcl_volume_id_0: + label: vSON DC Leader Volume ID 0 + hidden: false + immutable: false + type: string + description: Volume ID of the first vSON DC leader. + vson_dbs_image_name: + label: vSON base VM image name + hidden: false + immutable: false + type: string + description: VM Image name the vSON DBS instance will be created from. + default: VSON-BASE-1.0 + vson_mon_server_group_id: + label: vSON MON server group policy + hidden: false + immutable: false + type: string + description: "Tells what policy should be applied to the ServerGroup. Affinity\ + \ policy will force instances to share the same hypervisor. Anti-affinity\ + \ will force instances to run in different hypervisors. The group intended\ + \ for vSON MON instances. \n" + vson_mdr_volume_size_0: + label: vSON MDR cinder volume size + hidden: false + immutable: false + type: float + description: Size of the Cinder volume. Measured in gigabytes. + default: 50 + default_gateway: + label: Default gateway + hidden: false + immutable: false + type: string + description: Default gateway. + vson_mgt_volume_id_0: + label: vSON Management Volume ID 0 + hidden: false + immutable: false + type: string + description: Volume ID of the vSON Management server. + vson_dbg_server_group_policy: + label: vSON Database server group policy + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON DB Global instances. + default: anti-affinity + vson_mdr_volume_name_0: + label: vSON MGT volume name + hidden: false + immutable: false + type: string + description: Volume name. + default: vson_mdr_volume_0 + vson_dbg_volume_name_0: + label: vSON DBG volume name + hidden: false + immutable: false + type: string + description: Volume name. + vson_app_image_name: + label: vSON base VM image name + hidden: false + immutable: false + type: string + description: VM Image name the vSON APP instance will be created from. + default: VSON-BASE-1.0 + vson_app_volume_id_0: + label: vSON APP Volume ID 0 + hidden: false + immutable: false + type: string + description: Volume ID of the vSON APP server. + vnf_id: + label: VF ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF instance. + vson_dc_unit: + label: vSON Datacenter name + hidden: false + immutable: false + type: string + description: vSON Datacenter name. + swift_son_container_name: + label: SON Swift + hidden: false + immutable: false + type: string + description: Swift container storing vSON artifacts. + default: vson + oam_net_subnet_v6_prefix_length: + label: OAM net IPv6 subnet prefix length + hidden: false + immutable: false + type: string + description: OAM network IPv6 subnet prefix length. + vson_cll_volume_id_0: + label: vSON Cluster Leader Volume ID 0 + hidden: false + immutable: false + type: string + description: Volume ID of the first vSON Cluster leader. + ntp_servers: + label: NTP servers + hidden: false + immutable: false + type: list + description: List of NTP servers. + entry_schema: + type: string + vson_cll_volume_id_1: + label: vSON Cluster Leader Volume ID 1 + hidden: false + immutable: false + type: string + description: Volume ID of the second vSON Cluster leader. + vson_cll_volume_id_2: + label: vSON Cluster Leader Volume ID 2 + hidden: false + immutable: false + type: string + description: Volume ID of the third vSON Cluster leader. + vson_cll_volume_size_2: + label: Cinder volume ID 2 size + hidden: false + immutable: false + type: float + description: | + Size of the third Cinder volume. Measured in gigabytes. + vson_cll_volume_size_1: + label: Cinder volume ID 1 size + hidden: false + immutable: false + type: float + description: | + Size of the second Cinder volume. Measured in gigabytes. + vson_cll_volume_size_0: + label: Cinder volume ID 0 size + hidden: false + immutable: false + type: float + description: | + Size of the first Cinder volume. Measured in gigabytes. + vson_dcl_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + vson_app_volume_name_0: + label: vSON APP volume name + hidden: false + immutable: false + type: string + description: Volume name. + vson_mon_name_0: + label: vSON MON instance name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the vSON MON instance. + vson_mdr_name_0: + label: vSON Mediator instance name + hidden: false + immutable: false + type: string + description: Unique name to be issued to the vSON Mediator instance. + node_templates: + abstract_vson_vm_3_0: + type: org.openecomp.resource.abstract.nodes.heat.vson_vm_3 + directives: + - substitutable + properties: + vf_module_id: + get_input: vf_module_id + vson_cluster_name: '' + default_gateway: + get_input: default_gateway + port_vson_server_oam_net_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + instance_index: + get_property: + - SELF + - service_template_filter + - index_value + vnf_name: + get_input: vnf_name + oam_net_subnet_prefix_length: + get_input: oam_net_subnet_prefix_length + swift_storage_url: '' + vf_module_name: + get_input: vf_module_name + dns_servers: + get_input: dns_servers + oam_net_security_group_id: + get_input: oam_net_security_group_id + service_template_filter: + substitute_service_template: nested_vson_serverServiceTemplate.yaml + count: + get_input: number_of_servers + mandatory: false + vson_vm_image_name: + get_input: vson_clm_image_name + vnf_id: + get_input: vnf_id + vson_clm_oam_net_ip: + get_input: vson_clm_0_oam_net_ip_0 + port_vson_server_oam_net_port_0_mac_requirements: + mac_count_required: + is_required: false + oam_net_ips: + - get_input: vson_clm_oam_net_ip_0 + swift_son_container_name: '' + vfc_role: clm + swift_account_auth_token: + get_input: swift_account_auth_token + vson_server_group_id: + get_input: vson_clm_server_group_id + vson_vm_flavor_name: + get_input: vson_clm_flavor_name + port_vson_server_oam_net_port_0_network_role_tag: oam + availability_zones: + - get_input: availability_zone_0 + ntp_servers: + get_input: ntp_servers + oam_net_id: + get_input: oam_net_id + vson_vm_names: + - get_input: vson_clm_name_0 + abstract_vson_vm_1_0: + type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1 + directives: + - substitutable + properties: + vf_module_id: + get_input: vf_module_id + default_gateway: + get_input: default_gateway + port_vson_server_oam_net_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + instance_index: + get_property: + - SELF + - service_template_filter + - index_value + vnf_name: + get_input: vnf_name + oam_net_subnet_prefix_length: + get_input: oam_net_subnet_prefix_length + vf_module_name: + get_input: vf_module_name + dns_servers: + get_input: dns_servers + oam_net_security_group_id: + get_input: oam_net_security_group_id + service_template_filter: + substitute_service_template: nested_vson_server_with_volServiceTemplate.yaml + count: + get_input: number_of_servers + mandatory: false + vson_vm_image_name: + get_input: vson_dcl_image_name + vnf_id: + get_input: vnf_id + vson_clm_oam_net_ip: + get_input: vson_clm_0_oam_net_ip_0 + port_vson_server_oam_net_port_0_mac_requirements: + mac_count_required: + is_required: false + vson_dc_unit: + get_input: vson_dc_unit + oam_net_ips: + - get_input: vson_dcl_oam_net_ip_0 + - get_input: vson_dcl_oam_net_ip_1 + - get_input: vson_dcl_oam_net_ip_2 + vfc_role: dcl + swift_account_auth_token: + get_input: swift_account_auth_token + vson_server_group_id: + get_input: vson_leader_server_group_id + vson_vm_flavor_name: + get_input: vson_dcl_flavor_name + port_vson_server_oam_net_port_0_network_role_tag: oam + availability_zones: + - get_input: availability_zone_0 + - get_input: availability_zone_1 + - get_input: availability_zone_0 + volume_ids: + - get_input: vson_dcl_volume_id_0 + - get_input: vson_dcl_volume_id_1 + - get_input: vson_dcl_volume_id_2 + ntp_servers: + get_input: ntp_servers + vson_join_cluster_auth_token: + get_input: vson_join_cluster_auth_token + oam_net_id: + get_input: oam_net_id + vson_vm_names: + - get_input: vson_dcl_name_0 + - get_input: vson_dcl_name_1 + - get_input: vson_dcl_name_2 + abstract_vson_vm_2_0: + type: org.openecomp.resource.abstract.nodes.heat.vson_vm_2 + directives: + - substitutable + properties: + vf_module_id: + get_input: vf_module_id + default_gateway: + get_input: default_gateway + port_vson_server_oam_net_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + instance_index: + get_property: + - SELF + - service_template_filter + - index_value + vnf_name: + get_input: vnf_name + oam_net_subnet_prefix_length: + get_input: oam_net_subnet_prefix_length + vf_module_name: + get_input: vf_module_name + dns_servers: + get_input: dns_servers + oam_net_security_group_id: + get_input: oam_net_security_group_id + service_template_filter: + substitute_service_template: nested_vson_server_from_volServiceTemplate.yaml + count: + get_input: number_of_servers + mandatory: false + vnf_id: + get_input: vnf_id + vson_clm_oam_net_ip: + get_input: vson_clm_0_oam_net_ip_0 + port_vson_server_oam_net_port_0_mac_requirements: + mac_count_required: + is_required: false + vson_dc_unit: + get_input: vson_dc_unit + oam_net_ips: + - get_input: vson_mon_oam_net_ip_0 + vfc_role: mon + swift_account_auth_token: + get_input: swift_account_auth_token + vson_server_group_id: + get_input: vson_mon_server_group_id + vson_vm_flavor_name: + get_input: vson_mon_flavor_name + port_vson_server_oam_net_port_0_network_role_tag: oam + availability_zones: + - get_input: availability_zone_0 + volume_ids: + - get_input: vson_mon_volume_id_0 + ntp_servers: + get_input: ntp_servers + oam_net_id: + get_input: oam_net_id + vson_vm_names: + - get_input: vson_mon_name_0 + vson_dbc_volume_0: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_0 + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_dbc_volume_size_0) * 1024' + name: + get_input: vson_dbc_volume_name_0 + description: vSON DB Config cinder volume. + vson_mdr_volume_0: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_0 + image: + get_input: vson_mdr_image_name + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_mdr_volume_size_0) * 1024' + name: + get_input: vson_mdr_volume_name_0 + description: | + vSON MDR cinder volume. The volume is created from the vSON base VM image. + vson_mgt_volume_0: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_0 + image: + get_input: vson_mgt_image_name + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_mgt_volume_size_0) * 1024' + name: + get_input: vson_mgt_volume_name_0 + description: | + vSON MGT cinder volume. The volume is created from the vSON base VM image. + vson_mon_volume_0: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_0 + image: + get_input: vson_mon_image_name + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_mon_volume_size_0) * 1024' + name: + get_input: vson_mon_volume_name_0 + description: | + vSON MON cinder volume. The volume is created from the vSON base VM image. + vson_cll_volume_2: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_0 + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_cll_volume_size_2) * 1024' + name: + str_replace: + template: VNF_NAME_cll_volume_2 + params: + VNF_NAME: + get_input: vnf_name + description: Cinder volume for the third vSON Cluster leader. + vson_cll_volume_0: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_0 + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_cll_volume_size_0) * 1024' + name: + str_replace: + template: VNF_NAME_cll_volume_0 + params: + VNF_NAME: + get_input: vnf_name + description: Cinder volume for the first vSON Cluster leader. + vson_cll_volume_1: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_1 + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_cll_volume_size_1) * 1024' + name: + str_replace: + template: VNF_NAME_cll_volume_1 + params: + VNF_NAME: + get_input: vnf_name + description: Cinder volume for the second vSON Cluster leader. + vson_dbs_volume_1: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_1 + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_dbs_volume_size_1) * 1024' + name: + get_input: vson_dbs_volume_name_1 + description: Cinder volume for the second vSON DBS VM instance. + vson_dbs_volume_0: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_0 + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_dbs_volume_size_0) * 1024' + name: + get_input: vson_dbs_volume_name_0 + description: Cinder volume for the first vSON DBS VM instance. + vson_dcl_volume_2: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_0 + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_dcl_volume_size_2) * 1024' + name: + str_replace: + template: VNF_NAME_dcl_volume_2 + params: + VNF_NAME: + get_input: vnf_name + description: Cinder volume for the third vSON DC leader. + abstract_vson_vm_0: + type: org.openecomp.resource.abstract.nodes.heat.vson_vm + directives: + - substitutable + properties: + vf_module_id: + get_input: vf_module_id + default_gateway: + get_input: default_gateway + port_vson_server_oam_net_port_0_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + instance_index: + get_property: + - SELF + - service_template_filter + - index_value + vnf_name: + get_input: vnf_name + oam_net_subnet_prefix_length: + get_input: oam_net_subnet_prefix_length + vf_module_name: + get_input: vf_module_name + dns_servers: + get_input: dns_servers + oam_net_security_group_id: + get_input: oam_net_security_group_id + service_template_filter: + substitute_service_template: nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml + count: + get_input: number_of_servers + mandatory: false + vson_vm_image_name: + get_input: vson_app_image_name + vnf_id: + get_input: vnf_id + vson_clm_oam_net_ip: + get_input: vson_clm_0_oam_net_ip_0 + port_vson_server_oam_net_port_0_mac_requirements: + mac_count_required: + is_required: false + vson_dc_unit: + get_input: vson_dc_unit + oam_net_ips: + - get_input: vson_app_oam_net_ip_0 + oam_net_subnet_v6_prefix_length: + get_input: oam_net_subnet_v6_prefix_length + vfc_role: app + swift_account_auth_token: + get_input: swift_account_auth_token + default_gateway_v6: + get_input: default_gateway_v6 + vson_server_group_id: + get_input: vson_app_server_group_id + vson_vm_flavor_name: + get_input: vson_app_flavor_name + port_vson_server_oam_net_port_0_network_role_tag: oam + availability_zones: + - get_input: availability_zone_0 + volume_ids: + - get_input: vson_app_volume_id_0 + oam_net_v6_ips: + - get_input: vson_app_oam_net_v6_ip_0 + ntp_servers: + get_input: ntp_servers + vson_join_cluster_auth_token: + get_input: vson_join_cluster_auth_token + oam_net_id: + get_input: oam_net_id + vson_vm_names: + - get_input: vson_app_name_0 + vson_dcl_volume_0: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_0 + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_dcl_volume_size_0) * 1024' + name: + str_replace: + template: VNF_NAME_dcl_volume_0 + params: + VNF_NAME: + get_input: vnf_name + description: Cinder volume for the first vSON DC leader. + vson_dcl_volume_1: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_1 + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_dcl_volume_size_1) * 1024' + name: + str_replace: + template: VNF_NAME_dcl_volume_1 + params: + VNF_NAME: + get_input: vnf_name + description: Cinder volume for the second vSON DC leader. + oam_net_security_group: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules + properties: + name: + str_replace: + template: VNF_NAME_oam_sec_group + params: + VNF_NAME: + get_input: vnf_name + description: Security Group for instances connected to the OAM network. + rules: + - protocol: tcp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + port_range_max: 65535 + direction: egress + port_range_min: 1 + - protocol: udp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + port_range_max: 65535 + direction: egress + port_range_min: 1 + - protocol: '47' + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + port_range_max: 65535 + direction: egress + port_range_min: 1 + - protocol: icmp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + - protocol: tcp + ethertype: IPv6 + remote_ip_prefix: ::/0 + port_range_max: 65535 + direction: egress + port_range_min: 1 + - protocol: udp + ethertype: IPv6 + remote_ip_prefix: ::/0 + port_range_max: 65535 + direction: egress + port_range_min: 1 + - protocol: '47' + ethertype: IPv6 + remote_ip_prefix: ::/0 + port_range_max: 65535 + direction: egress + port_range_min: 1 + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: egress + - protocol: tcp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + port_range_max: 65535 + direction: ingress + port_range_min: 1 + - protocol: udp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + port_range_max: 65535 + direction: ingress + port_range_min: 1 + - protocol: '47' + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + port_range_max: 65535 + direction: ingress + port_range_min: 1 + - protocol: icmp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + - protocol: tcp + ethertype: IPv6 + remote_ip_prefix: ::/0 + port_range_max: 65535 + direction: ingress + port_range_min: 1 + - protocol: udp + ethertype: IPv6 + remote_ip_prefix: ::/0 + port_range_max: 65535 + direction: ingress + port_range_min: 1 + - protocol: '47' + ethertype: IPv6 + remote_ip_prefix: ::/0 + port_range_max: 65535 + direction: ingress + port_range_min: 1 + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: ingress + requirements: + - port: + capability: attachment_vson_server_oam_net_port_0 + node: abstract_vson_vm_3_0 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_vson_server_oam_net_port_0 + node: abstract_vson_vm_1_0 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_vson_server_oam_net_port_0 + node: abstract_vson_vm_1_0 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_vson_server_oam_net_port_0 + node: abstract_vson_vm_1_0 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_vson_server_oam_net_port_0 + node: abstract_vson_vm_3_0 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_vson_server_oam_net_port_0 + node: abstract_vson_vm_2_0 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_vson_server_oam_net_port_0 + node: abstract_vson_vm_1_0 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_vson_server_oam_net_port_0 + node: abstract_vson_vm_0 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_vson_server_oam_net_port_0 + node: abstract_vson_vm_1_0 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_vson_server_oam_net_port_0 + node: abstract_vson_vm_2_0 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_vson_server_oam_net_port_0 + node: abstract_vson_vm_2_0 + relationship: org.openecomp.relationships.AttachesTo + vson_dbg_volume_0: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_0 + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_dbg_volume_size_0) * 1024' + name: + get_input: vson_dbg_volume_name_0 + description: vSON DB Global cinder volume. + vson_app_volume_0: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_input: availability_zone_0 + metadata: + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + size: '(get_input : vson_app_volume_size_0) * 1024' + name: + get_input: vson_app_volume_name_0 + description: vSON APP cinder volume. + groups: + module_5_vson_dbg_volume_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_5_vson_dbg_volume.yaml + description: | + Creates a Cinder volume. Cinder volume is a storage in the form of block devices. It can be used, for example, for providing storage to instance. Volume supports creation from snapshot, backup or image. Also volume can be created only by size. The template creates volumes for vSON DB Global servers (Virtual Function Component DBG). + members: + - vson_dbg_volume_0 + module_7_vson_app_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_7_vson_app.yaml + description: The template deploys vSON VFC of type APP. + members: + - abstract_vson_vm_0 + module_2_vson_mdr_volume_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_2_vson_mdr_volume.yaml + description: | + Create a Cinder volume. Cinder volume is a storage in the form of block devices. It can be used, for example, for providing storage to instance. Volume supports creation from snapshot, backup or image. Also volume can be created only by size. The template creates volume for vSON Mediator server (Virtual Function Component MDR). + members: + - vson_mdr_volume_0 + module_3_vson_cll_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_3_vson_cll.yaml + description: | + The template deploys three instances of vSON Cluster leaders, instantiates cluster and the first Datacenter. + members: + - abstract_vson_vm_1_0 + module_6_vson_dbs_volume_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_6_vson_dbs_volume.yaml + description: "Creates Cinder volumes. Cinder volume is a storage in the form\ + \ of block devices. It can be used, for example, for providing storage\ + \ to instance. Volume supports creation from snapshot, backup or image.\ + \ Also volume can be created only by size. The template creates volumes\ + \ for vSON Database servers configured for sharding (Virtual Function Component\ + \ DBS). The shard consists of two Database instances: - Primary - Secondary\ + \ \n" + members: + - vson_dbs_volume_1 + - vson_dbs_volume_0 + module_0_vson_mgt_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_0_vson_mgt.yaml + description: The template deploys vSON VFC of type MGT. + members: + - abstract_vson_vm_2_0 + module_1_vson_mon_volume_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_1_vson_mon_volume.yaml + description: | + Create a Cinder volume. Cinder volume is a storage in the form of block devices. It can be used, for example, for providing storage to instance. Volume supports creation from snapshot, backup or image. Also volume can be created only by size. The template creates volume for vSON Monitor and KPIs routing server (Virtual Function Component MON). + members: + - vson_mon_volume_0 + module_2_vson_mdr_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_2_vson_mdr.yaml + description: The template deploys vSON VFC of type Mediator (MDR). + members: + - abstract_vson_vm_2_0 + module_0_vson_mgt_volume_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_0_vson_mgt_volume.yaml + description: | + Create a Cinder volume. Cinder volume is a storage in the form of block devices. It can be used, for example, for providing storage to instance. Volume supports creation from snapshot, backup or image. Also volume can be created only by size. The template creates volume for vSON Management server (Virtual Function Component MGT). + members: + - vson_mgt_volume_0 + module_8_vson_dcl_volume_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_8_vson_dcl_volume.yaml + description: | + Creates Cinder volumes. Cinder volume is a storage in the form of block devices. It can be used, for example, for providing storage to instance. Volume supports creation from snapshot, backup or image. Also volume can be created only by size. The template creates volumes for vSON DC leaders (Virtual Function Component DCL). + members: + - vson_dcl_volume_2 + - vson_dcl_volume_0 + - vson_dcl_volume_1 + module_7_vson_app_volume_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_7_vson_app_volume.yaml + description: | + Creates a Cinder volume. Cinder volume is a storage in the form of block devices. It can be used, for example, for providing storage to instance. Volume supports creation from snapshot, backup or image. Also volume can be created only by size. The template creates volume for vSON APP server (Virtual Function Component APP). + members: + - vson_app_volume_0 + module_4_vson_dbc_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_4_vson_dbc.yaml + description: The template deploys vSON VFC of type Database Config (DBC). + members: + - abstract_vson_vm_1_0 + module_3_vson_cll_volume_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_3_vson_cll_volume.yaml + description: | + Creates Cinder volumes. Cinder volume is a storage in the form of block devices. It can be used, for example, for providing storage to instance. Volume supports creation from snapshot, backup or image. Also volume can be created only by size. The template creates volumes for the vSON Cluster leaders (Virtual Function Component CLL). + members: + - vson_cll_volume_2 + - vson_cll_volume_0 + - vson_cll_volume_1 + module_8_vson_dcl_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_8_vson_dcl.yaml + description: The template deploys vSON Datacenter. + members: + - abstract_vson_vm_1_0 + module_9_vson_clm_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_9_vson_clm.yaml + description: The template deploys vSON VFC of type CLM. + members: + - abstract_vson_vm_3_0 + module_4_vson_dbc_volume_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_4_vson_dbc_volume.yaml + description: | + Creates a Cinder volume. Cinder volume is a storage in the form of block devices. It can be used, for example, for providing storage to instance. Volume supports creation from snapshot, backup or image. Also volume can be created only by size. The template creates volume for vSON DB Config servers (Virtual Function Component DBC). + members: + - vson_dbc_volume_0 + base_vson_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/base_vson.yaml + description: | + Creates essential resources: vSON internal network, Security Groups and vSON Cluster Manager instance. Deploys and configure appropriate software on the Cluster Management server. Exposes shared resource as outputs that could be used by add-on templates. + members: + - oam_net_security_group + - abstract_vson_vm_3_0 + module_6_vson_dbs_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_6_vson_dbs.yaml + description: "The template deploys vSON VFC of type Database Shard (DBS) VM\ + \ instances: Primary and Secondary. \n" + members: + - abstract_vson_vm_1_0 + module_5_vson_dbg_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_5_vson_dbg.yaml + description: The template deploys vSON VFC of type Database Global (DBG). + members: + - abstract_vson_vm_1_0 + module_1_vson_mon_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/module_1_vson_mon.yaml + description: The template deploys vSON VFC of type MON. + members: + - abstract_vson_vm_2_0 + outputs: + vson_dbg_volume_id_0: + description: vSON DB Global volume ID. + value: vson_dbg_volume_0 + vson_dbs_server_group_id: + description: ID of the Server Group intended for vSON DBS instances. + value: UNSUPPORTED_RESOURCE_vson_dbs_server_group + vson_mdr_volume_id_0: + description: Volume ID. + value: vson_mdr_volume_0 + vson_mgt_volume_id_0: + description: ID of the vSON Management volume. + value: vson_mgt_volume_0 + vson_mgt_server_group_id: + description: ID of the Server Group intended for vSON Management instances. + value: UNSUPPORTED_RESOURCE_vson_mgt_server_group + vson_cll_volume_id_0: + description: First vSON Cluster leader volume ID. + value: vson_cll_volume_0 + vson_cll_volume_id_1: + description: Second vSON Cluster leader volume ID. + value: vson_cll_volume_1 + vson_cll_volume_id_2: + description: Third vSON Cluster leader volume ID. + value: vson_cll_volume_2 + vson_dbg_server_group_id: + description: ID of the Server Group intended for vSON DBG instances. + value: UNSUPPORTED_RESOURCE_vson_dbg_server_group + vson_leader_server_group_id: + description: ID of the Server Group intended for vSON Cluster/DC leaders. + value: UNSUPPORTED_RESOURCE_vson_leader_server_group + vson_clm_0_oam_net_ip_0: + description: vSON Cluster Management server IP on the OAM network. + value: + get_input: vson_clm_oam_net_ip_0 + vson_clm_server_group_id: + description: ID of the Server Group intended for vSON Cluster Management instances. + value: UNSUPPORTED_RESOURCE_vson_clm_server_group + vson_mdr_server_group_id: + description: ID of the Server Group intended for vSON Mediator instances. + value: UNSUPPORTED_RESOURCE_vson_mdr_server_group + vson_dbc_server_group_id: + description: ID of the Server Group intended for vSON DBC instances. + value: UNSUPPORTED_RESOURCE_vson_dbc_server_group + vson_app_server_group_id: + description: ID of the Server Group intended for vSON Application instances. + value: UNSUPPORTED_RESOURCE_vson_app_server_group + vson_mon_volume_id_0: + description: ID of the vSON Monitor and KPIs routing volume. + value: vson_mon_volume_0 + vson_app_volume_id_0: + description: vSON APP volume ID. + value: vson_app_volume_0 + vson_dcl_volume_id_2: + description: ID of the third vSON DC leader volume. + value: vson_dcl_volume_2 + vson_dcl_volume_id_1: + description: ID of the second vSON DC leader volume. + value: vson_dcl_volume_1 + vson_dbs_volume_id_0: + description: ID of the first vSON DBS volume. + value: vson_dbs_volume_0 + vson_dbc_volume_id_0: + description: vSON DB Config volume ID. + value: vson_dbc_volume_0 + vson_dcl_volume_id_0: + description: ID of the first vSON DC leader volume. + value: vson_dcl_volume_0 + vson_dbs_volume_id_1: + description: ID of the second vSON DBS volume. + value: vson_dbs_volume_1 + vson_mon_server_group_id: + description: ID of the Server Group intended for vSON MON instances. + value: UNSUPPORTED_RESOURCE_vson_mon_server_group \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml new file mode 100644 index 0000000000..f4845f41a3 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml @@ -0,0 +1,452 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested_vson_server +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.nodes.heat.vson_vm: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + vf_module_id: + label: VF module ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF Module instance + vson_cluster_name: + label: vSON Cluster name + hidden: false + immutable: false + type: string + description: Name of the vSON Cluster. + default_gateway: + label: Default gateway + hidden: false + immutable: false + type: string + description: Default gateway. + port_vson_server_oam_net_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + instance_index: + label: Instance Index + hidden: false + immutable: false + type: float + description: Index of the instance. + vnf_name: + label: VF name + hidden: false + immutable: false + type: string + description: Unique name for this VF instance. + oam_net_subnet_prefix_length: + label: OAM net subnet prefix length + hidden: false + immutable: false + type: string + description: Prefix length of the subnet on the OAM network. + swift_storage_url: + label: swift storage URL + hidden: false + immutable: false + type: string + description: | + Swift storage URL. Example: http://172.16.209.246:8080/v1/AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 http://172.16.209.246:8080 - protocol, IP and port, v1 - API version AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 - account ID + vf_module_name: + label: VF module name + hidden: false + immutable: false + type: string + description: Unique name for this VF module instance. + dns_servers: + label: DNS servers + hidden: false + immutable: false + type: list + description: List of DNS servers. + entry_schema: + type: string + oam_net_security_group_id: + label: OAM network security group ID + hidden: false + immutable: false + type: string + description: | + The ID of Security group applied on the port bound to the vSON OAM network. + vson_vm_image_name: + label: vSON base VM image name + hidden: false + immutable: false + type: string + description: VM Image name the vSON instance will be created from. + vnf_id: + label: VF ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF instance. + port_vson_server_oam_net_port_0_network_role: + type: string + required: true + vson_clm_oam_net_ip: + label: vSON Cluster Manager IP + hidden: false + immutable: false + type: string + description: IP of the vSON Cluster Manager. + port_vson_server_oam_net_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_vson_server_oam_net_port_0_subnetpoolid: + type: string + required: true + oam_net_ips: + label: vSON OAM network IP addresses + hidden: false + immutable: false + type: list + description: Fixed IP assignments for vSON instances on the OAM network. + entry_schema: + type: string + swift_son_container_name: + label: SON Swift + hidden: false + immutable: false + type: string + description: Swift container storing vSON artifacts. + vfc_role: + label: VF module ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF Module instance + swift_account_auth_token: + label: Swift account auth token + hidden: false + immutable: false + type: string + description: | + Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 + vson_server_group_id: + label: vSON server group ID + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. + vson_vm_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + port_vson_server_oam_net_port_0_network_role_tag: + type: string + required: true + port_vson_server_oam_net_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + availability_zones: + label: Availability zones + hidden: false + immutable: false + type: list + description: List of availability zones. + entry_schema: + type: string + ntp_servers: + label: NTP servers + hidden: false + immutable: false + type: list + description: List of NTP servers. + entry_schema: + type: string + oam_net_id: + label: OAM network ID + hidden: false + immutable: false + type: string + description: The ID of the OAM network. + port_vson_server_oam_net_port_0_order: + type: integer + required: true + port_vson_server_oam_net_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vson_vm_names: + label: vSON Cluster leader names + hidden: false + immutable: false + type: list + description: A list of unique names to be issued to the vSON Cluster leaders. + entry_schema: + type: string + node_templates: + vson_server: + type: org.openecomp.resource.vfc.nodes.heat.vson_vm + properties: + flavor: + get_input: vson_vm_flavor_name + availability_zone: + get_input: + - availability_zones + - get_input: instance_index + image: + get_input: vson_vm_image_name + metadata: + vf_module_id: + get_input: vf_module_id + vm_role: + get_input: vfc_role + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + config_drive: true + user_data_format: RAW + name: + get_input: + - vson_vm_names + - get_input: instance_index + scheduler_hints: + group: + get_input: vson_server_group_id + vson_server_oam_net_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + get_input: port_vson_server_oam_net_port_0_ip_requirements + security_groups: + - get_input: oam_net_security_group_id + network_role: + get_input: port_vson_server_oam_net_port_0_network_role + fixed_ips: + - ip_address: + get_input: + - oam_net_ips + - get_input: instance_index + subnetpoolid: + get_input: port_vson_server_oam_net_port_0_subnetpoolid + mac_requirements: + get_input: port_vson_server_oam_net_port_0_mac_requirements + name: + str_replace: + template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 + params: + VNF_NAME: + get_input: vnf_name + VNF_ID: + get_input: vnf_id + SERVER_NAME: + get_input: + - vson_vm_names + - get_input: instance_index + exCP_naming: + get_input: port_vson_server_oam_net_port_0_exCP_naming + vlan_requirements: + get_input: port_vson_server_oam_net_port_0_vlan_requirements + network_role_tag: + get_input: port_vson_server_oam_net_port_0_network_role_tag + network: + get_input: oam_net_id + order: + get_input: port_vson_server_oam_net_port_0_order + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vson_server + relationship: tosca.relationships.network.BindsTo + groups: + nested_vson_server_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested_vson_server.yaml + description: | + The template intended for deploying vSON VM instance. + members: + - vson_server + - vson_server_oam_net_port_0 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm_3 + capabilities: + disk.write.bytes_vson_server: + - vson_server + - disk.write.bytes + disk.device.allocation_vson_server: + - vson_server + - disk.device.allocation + network.incoming.packets_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.packets + memory.usage_vson_server: + - vson_server + - memory.usage + network.incoming.bytes_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.bytes + disk.device.latency_vson_server: + - vson_server + - disk.device.latency + disk.device.write.bytes.rate_vson_server: + - vson_server + - disk.device.write.bytes.rate + disk.device.read.requests_vson_server: + - vson_server + - disk.device.read.requests + memory_vson_server: + - vson_server + - memory + disk.latency_vson_server: + - vson_server + - disk.latency + os_vson_server: + - vson_server + - os + feature_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - feature + instance_vson_server: + - vson_server + - instance + cpu_vson_server: + - vson_server + - cpu + attachment_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - attachment + disk.iops_vson_server: + - vson_server + - disk.iops + network.outgoing.bytes_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outgoing.bytes + disk.device.write.bytes_vson_server: + - vson_server + - disk.device.write.bytes + disk.device.read.bytes.rate_vson_server: + - vson_server + - disk.device.read.bytes.rate + endpoint_vson_server: + - vson_server + - endpoint + vcpus_vson_server: + - vson_server + - vcpus + network.incoming.packets.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.packets.rate + disk.device.read.requests.rate_vson_server: + - vson_server + - disk.device.read.requests.rate + disk.write.requests.rate_vson_server: + - vson_server + - disk.write.requests.rate + disk.capacity_vson_server: + - vson_server + - disk.capacity + disk.device.capacity_vson_server: + - vson_server + - disk.device.capacity + disk.device.iops_vson_server: + - vson_server + - disk.device.iops + disk.device.write.requests.rate_vson_server: + - vson_server + - disk.device.write.requests.rate + network.outpoing.packets_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outpoing.packets + disk.read.bytes_vson_server: + - vson_server + - disk.read.bytes + disk.read.bytes.rate_vson_server: + - vson_server + - disk.read.bytes.rate + disk.device.write.requests_vson_server: + - vson_server + - disk.device.write.requests + network.outgoing.packets.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outgoing.packets.rate + disk.root.size_vson_server: + - vson_server + - disk.root.size + disk.ephemeral.size_vson_server: + - vson_server + - disk.ephemeral.size + memory.resident_vson_server: + - vson_server + - memory.resident + disk.device.read.bytes_vson_server: + - vson_server + - disk.device.read.bytes + scalable_vson_server: + - vson_server + - scalable + network.outgoing.bytes.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outgoing.bytes.rate + disk.write.requests_vson_server: + - vson_server + - disk.write.requests + disk.usage_vson_server: + - vson_server + - disk.usage + cpu_util_vson_server: + - vson_server + - cpu_util + disk.device.usage_vson_server: + - vson_server + - disk.device.usage + cpu.delta_vson_server: + - vson_server + - cpu.delta + disk.write.bytes.rate_vson_server: + - vson_server + - disk.write.bytes.rate + feature_vson_server: + - vson_server + - feature + disk.allocation_vson_server: + - vson_server + - disk.allocation + binding_vson_server: + - vson_server + - binding + host_vson_server: + - vson_server + - host + binding_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - binding + network.incoming.bytes.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.bytes.rate + disk.read.requests_vson_server: + - vson_server + - disk.read.requests + requirements: + link_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - link + dependency_vson_server: + - vson_server + - dependency + dependency_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - dependency + local_storage_vson_server: + - vson_server + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml new file mode 100644 index 0000000000..4273bf1169 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml @@ -0,0 +1,439 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested_vson_server_from_vol +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.nodes.heat.vson_vm: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + vf_module_id: + label: VF module ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF Module instance + default_gateway: + label: Default gateway + hidden: false + immutable: false + type: string + description: Default gateway. + port_vson_server_oam_net_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + instance_index: + label: Instance Index + hidden: false + immutable: false + type: float + description: Index of the instance. + vnf_name: + label: VF name + hidden: false + immutable: false + type: string + description: Unique name for this VF instance. + oam_net_subnet_prefix_length: + label: OAM net subnet prefix length + hidden: false + immutable: false + type: string + description: Prefix length of the subnet on the OAM network. + vf_module_name: + label: VF module name + hidden: false + immutable: false + type: string + description: Unique name for this VF module instance. + dns_servers: + label: DNS servers + hidden: false + immutable: false + type: list + description: List of DNS servers. + entry_schema: + type: string + oam_net_security_group_id: + label: OAM network security group ID + hidden: false + immutable: false + type: string + description: | + The ID of Security group applied on the port bound to the vSON OAM network. + vnf_id: + label: VF ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF instance. + port_vson_server_oam_net_port_0_network_role: + type: string + required: true + vson_clm_oam_net_ip: + label: vSON Cluster Manager IP + hidden: false + immutable: false + type: string + description: IP of the vSON Cluster Manager. + port_vson_server_oam_net_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_vson_server_oam_net_port_0_subnetpoolid: + type: string + required: true + vson_dc_unit: + label: vSON Data Center name + hidden: false + immutable: false + type: string + description: Name of the vSON Data Center. + oam_net_ips: + label: vSON OAM network IP addresses + hidden: false + immutable: false + type: list + description: Fixed IP assignments for vSON instances on the OAM network. + entry_schema: + type: string + vfc_role: + label: VF module ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF Module instance + swift_account_auth_token: + label: Swift account auth token + hidden: false + immutable: false + type: string + description: | + Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 + vson_server_group_id: + label: vSON server group ID + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. + vson_vm_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + port_vson_server_oam_net_port_0_network_role_tag: + type: string + required: true + port_vson_server_oam_net_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + availability_zones: + label: Availability zones + hidden: false + immutable: false + type: list + description: List of availability zones. + entry_schema: + type: string + volume_ids: + label: Volumes IDs + hidden: false + immutable: false + type: list + description: List of Volumes IDs. + entry_schema: + type: string + ntp_servers: + label: NTP servers + hidden: false + immutable: false + type: list + description: List of NTP servers. + entry_schema: + type: string + oam_net_id: + label: OAM network ID + hidden: false + immutable: false + type: string + description: The ID of the OAM network. + port_vson_server_oam_net_port_0_order: + type: integer + required: true + port_vson_server_oam_net_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vson_vm_names: + label: vSON Cluster leader names + hidden: false + immutable: false + type: list + description: A list of unique names to be issued to the vSON Cluster leaders. + entry_schema: + type: string + node_templates: + vson_server: + type: org.openecomp.resource.vfc.nodes.heat.vson_vm + properties: + flavor: + get_input: vson_vm_flavor_name + availability_zone: + get_input: + - availability_zones + - get_input: instance_index + metadata: + vf_module_id: + get_input: vf_module_id + vm_role: + get_input: vfc_role + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + config_drive: true + user_data_format: RAW + name: + get_input: + - vson_vm_names + - get_input: instance_index + scheduler_hints: + group: + get_input: vson_server_group_id + vson_server_oam_net_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + get_input: port_vson_server_oam_net_port_0_ip_requirements + security_groups: + - get_input: oam_net_security_group_id + network_role: + get_input: port_vson_server_oam_net_port_0_network_role + fixed_ips: + - ip_address: + get_input: + - oam_net_ips + - get_input: instance_index + subnetpoolid: + get_input: port_vson_server_oam_net_port_0_subnetpoolid + mac_requirements: + get_input: port_vson_server_oam_net_port_0_mac_requirements + name: + str_replace: + template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 + params: + VNF_NAME: + get_input: vnf_name + VNF_ID: + get_input: vnf_id + SERVER_NAME: + get_input: + - vson_vm_names + - get_input: instance_index + exCP_naming: + get_input: port_vson_server_oam_net_port_0_exCP_naming + vlan_requirements: + get_input: port_vson_server_oam_net_port_0_vlan_requirements + network_role_tag: + get_input: port_vson_server_oam_net_port_0_network_role_tag + network: + get_input: oam_net_id + order: + get_input: port_vson_server_oam_net_port_0_order + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vson_server + relationship: tosca.relationships.network.BindsTo + groups: + nested_vson_server_from_vol_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested_vson_server_from_vol.yaml + description: | + The template intended for deploying vSON VM instance that's supposed to be booted from a Cinder volume. + members: + - vson_server + - vson_server_oam_net_port_0 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm_3 + capabilities: + disk.write.bytes_vson_server: + - vson_server + - disk.write.bytes + disk.device.allocation_vson_server: + - vson_server + - disk.device.allocation + network.incoming.packets_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.packets + memory.usage_vson_server: + - vson_server + - memory.usage + network.incoming.bytes_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.bytes + disk.device.latency_vson_server: + - vson_server + - disk.device.latency + disk.device.write.bytes.rate_vson_server: + - vson_server + - disk.device.write.bytes.rate + disk.device.read.requests_vson_server: + - vson_server + - disk.device.read.requests + memory_vson_server: + - vson_server + - memory + disk.latency_vson_server: + - vson_server + - disk.latency + os_vson_server: + - vson_server + - os + feature_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - feature + instance_vson_server: + - vson_server + - instance + cpu_vson_server: + - vson_server + - cpu + attachment_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - attachment + disk.iops_vson_server: + - vson_server + - disk.iops + network.outgoing.bytes_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outgoing.bytes + disk.device.write.bytes_vson_server: + - vson_server + - disk.device.write.bytes + disk.device.read.bytes.rate_vson_server: + - vson_server + - disk.device.read.bytes.rate + endpoint_vson_server: + - vson_server + - endpoint + vcpus_vson_server: + - vson_server + - vcpus + network.incoming.packets.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.packets.rate + disk.device.read.requests.rate_vson_server: + - vson_server + - disk.device.read.requests.rate + disk.write.requests.rate_vson_server: + - vson_server + - disk.write.requests.rate + disk.capacity_vson_server: + - vson_server + - disk.capacity + disk.device.capacity_vson_server: + - vson_server + - disk.device.capacity + disk.device.iops_vson_server: + - vson_server + - disk.device.iops + disk.device.write.requests.rate_vson_server: + - vson_server + - disk.device.write.requests.rate + network.outpoing.packets_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outpoing.packets + disk.read.bytes_vson_server: + - vson_server + - disk.read.bytes + disk.read.bytes.rate_vson_server: + - vson_server + - disk.read.bytes.rate + disk.device.write.requests_vson_server: + - vson_server + - disk.device.write.requests + network.outgoing.packets.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outgoing.packets.rate + disk.root.size_vson_server: + - vson_server + - disk.root.size + disk.ephemeral.size_vson_server: + - vson_server + - disk.ephemeral.size + memory.resident_vson_server: + - vson_server + - memory.resident + disk.device.read.bytes_vson_server: + - vson_server + - disk.device.read.bytes + scalable_vson_server: + - vson_server + - scalable + network.outgoing.bytes.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outgoing.bytes.rate + disk.write.requests_vson_server: + - vson_server + - disk.write.requests + disk.usage_vson_server: + - vson_server + - disk.usage + cpu_util_vson_server: + - vson_server + - cpu_util + disk.device.usage_vson_server: + - vson_server + - disk.device.usage + cpu.delta_vson_server: + - vson_server + - cpu.delta + disk.write.bytes.rate_vson_server: + - vson_server + - disk.write.bytes.rate + feature_vson_server: + - vson_server + - feature + disk.allocation_vson_server: + - vson_server + - disk.allocation + binding_vson_server: + - vson_server + - binding + host_vson_server: + - vson_server + - host + binding_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - binding + network.incoming.bytes.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.bytes.rate + disk.read.requests_vson_server: + - vson_server + - disk.read.requests + requirements: + link_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - link + dependency_vson_server: + - vson_server + - dependency + dependency_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - dependency + local_storage_vson_server: + - vson_server + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml new file mode 100644 index 0000000000..eda87f5d01 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml @@ -0,0 +1,454 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested_vson_server_with_vol +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.nodes.heat.vson_vm: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + vf_module_id: + label: VF module ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF Module instance + default_gateway: + label: Default gateway + hidden: false + immutable: false + type: string + description: Default gateway. + port_vson_server_oam_net_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + instance_index: + label: Instance Index + hidden: false + immutable: false + type: float + description: Index of the instance. + vnf_name: + label: VF name + hidden: false + immutable: false + type: string + description: Unique name for this VF instance. + oam_net_subnet_prefix_length: + label: OAM net subnet prefix length + hidden: false + immutable: false + type: string + description: Prefix length of the subnet on the OAM network. + vf_module_name: + label: VF module name + hidden: false + immutable: false + type: string + description: Unique name for this VF module instance. + dns_servers: + label: DNS servers + hidden: false + immutable: false + type: list + description: List of DNS servers. + entry_schema: + type: string + oam_net_security_group_id: + label: OAM network security group ID + hidden: false + immutable: false + type: string + description: | + The ID of Security group applied on the port bound to the vSON OAM network. + vson_vm_image_name: + label: vSON base VM image name + hidden: false + immutable: false + type: string + description: VM Image name the vSON instance will be created from. + vnf_id: + label: VF ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF instance. + port_vson_server_oam_net_port_0_network_role: + type: string + required: true + vson_clm_oam_net_ip: + label: vSON Cluster Manager IP + hidden: false + immutable: false + type: string + description: IP of the vSON Cluster Manager. + port_vson_server_oam_net_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_vson_server_oam_net_port_0_subnetpoolid: + type: string + required: true + vson_dc_unit: + label: vSON Data Center name + hidden: false + immutable: false + type: string + description: Name of the vSON Data Center. + oam_net_ips: + label: vSON OAM network IP addresses + hidden: false + immutable: false + type: list + description: Fixed IP assignments for vSON instances on the OAM network. + entry_schema: + type: string + vfc_role: + label: VF module ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF Module instance + swift_account_auth_token: + label: Swift account auth token + hidden: false + immutable: false + type: string + description: | + Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 + vson_server_group_id: + label: vSON server group ID + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. + vson_vm_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + port_vson_server_oam_net_port_0_network_role_tag: + type: string + required: true + port_vson_server_oam_net_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + availability_zones: + label: Availability zones + hidden: false + immutable: false + type: list + description: List of availability zones. + entry_schema: + type: string + volume_ids: + label: Volumes IDs + hidden: false + immutable: false + type: list + description: List of Volumes IDs. + entry_schema: + type: string + ntp_servers: + label: NTP servers + hidden: false + immutable: false + type: list + description: List of NTP servers. + entry_schema: + type: string + vson_join_cluster_auth_token: + label: vSON join cluster auth token + hidden: false + immutable: false + type: string + description: "Authentication Token generated for the user permitted to add \ + \ a new Datacenter/vSON member to existing vSON Cluster. \n" + oam_net_id: + label: OAM network ID + hidden: false + immutable: false + type: string + description: The ID of the OAM network. + port_vson_server_oam_net_port_0_order: + type: integer + required: true + port_vson_server_oam_net_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vson_vm_names: + label: vSON Cluster leader names + hidden: false + immutable: false + type: list + description: A list of unique names to be issued to the vSON Cluster leaders. + entry_schema: + type: string + node_templates: + vson_server: + type: org.openecomp.resource.vfc.nodes.heat.vson_vm + properties: + flavor: + get_input: vson_vm_flavor_name + availability_zone: + get_input: + - availability_zones + - get_input: instance_index + image: + get_input: vson_vm_image_name + metadata: + vf_module_id: + get_input: vf_module_id + vm_role: + get_input: vfc_role + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + config_drive: true + user_data_format: RAW + name: + get_input: + - vson_vm_names + - get_input: instance_index + scheduler_hints: + group: + get_input: vson_server_group_id + vson_server_oam_net_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + get_input: port_vson_server_oam_net_port_0_ip_requirements + security_groups: + - get_input: oam_net_security_group_id + network_role: + get_input: port_vson_server_oam_net_port_0_network_role + fixed_ips: + - ip_address: + get_input: + - oam_net_ips + - get_input: instance_index + subnetpoolid: + get_input: port_vson_server_oam_net_port_0_subnetpoolid + mac_requirements: + get_input: port_vson_server_oam_net_port_0_mac_requirements + name: + str_replace: + template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 + params: + VNF_NAME: + get_input: vnf_name + VNF_ID: + get_input: vnf_id + SERVER_NAME: + get_input: + - vson_vm_names + - get_input: instance_index + exCP_naming: + get_input: port_vson_server_oam_net_port_0_exCP_naming + vlan_requirements: + get_input: port_vson_server_oam_net_port_0_vlan_requirements + network_role_tag: + get_input: port_vson_server_oam_net_port_0_network_role_tag + network: + get_input: oam_net_id + order: + get_input: port_vson_server_oam_net_port_0_order + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vson_server + relationship: tosca.relationships.network.BindsTo + groups: + nested_vson_server_with_vol_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested_vson_server_with_vol.yaml + description: | + The template intended for deploying vSON VM instance. + members: + - vson_server + - vson_server_oam_net_port_0 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm_3 + capabilities: + disk.write.bytes_vson_server: + - vson_server + - disk.write.bytes + disk.device.allocation_vson_server: + - vson_server + - disk.device.allocation + network.incoming.packets_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.packets + memory.usage_vson_server: + - vson_server + - memory.usage + network.incoming.bytes_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.bytes + disk.device.latency_vson_server: + - vson_server + - disk.device.latency + disk.device.write.bytes.rate_vson_server: + - vson_server + - disk.device.write.bytes.rate + disk.device.read.requests_vson_server: + - vson_server + - disk.device.read.requests + memory_vson_server: + - vson_server + - memory + disk.latency_vson_server: + - vson_server + - disk.latency + os_vson_server: + - vson_server + - os + feature_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - feature + instance_vson_server: + - vson_server + - instance + cpu_vson_server: + - vson_server + - cpu + attachment_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - attachment + disk.iops_vson_server: + - vson_server + - disk.iops + network.outgoing.bytes_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outgoing.bytes + disk.device.write.bytes_vson_server: + - vson_server + - disk.device.write.bytes + disk.device.read.bytes.rate_vson_server: + - vson_server + - disk.device.read.bytes.rate + endpoint_vson_server: + - vson_server + - endpoint + vcpus_vson_server: + - vson_server + - vcpus + network.incoming.packets.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.packets.rate + disk.device.read.requests.rate_vson_server: + - vson_server + - disk.device.read.requests.rate + disk.write.requests.rate_vson_server: + - vson_server + - disk.write.requests.rate + disk.capacity_vson_server: + - vson_server + - disk.capacity + disk.device.capacity_vson_server: + - vson_server + - disk.device.capacity + disk.device.iops_vson_server: + - vson_server + - disk.device.iops + disk.device.write.requests.rate_vson_server: + - vson_server + - disk.device.write.requests.rate + network.outpoing.packets_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outpoing.packets + disk.read.bytes_vson_server: + - vson_server + - disk.read.bytes + disk.read.bytes.rate_vson_server: + - vson_server + - disk.read.bytes.rate + disk.device.write.requests_vson_server: + - vson_server + - disk.device.write.requests + network.outgoing.packets.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outgoing.packets.rate + disk.root.size_vson_server: + - vson_server + - disk.root.size + disk.ephemeral.size_vson_server: + - vson_server + - disk.ephemeral.size + memory.resident_vson_server: + - vson_server + - memory.resident + disk.device.read.bytes_vson_server: + - vson_server + - disk.device.read.bytes + scalable_vson_server: + - vson_server + - scalable + network.outgoing.bytes.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outgoing.bytes.rate + disk.write.requests_vson_server: + - vson_server + - disk.write.requests + disk.usage_vson_server: + - vson_server + - disk.usage + cpu_util_vson_server: + - vson_server + - cpu_util + disk.device.usage_vson_server: + - vson_server + - disk.device.usage + cpu.delta_vson_server: + - vson_server + - cpu.delta + disk.write.bytes.rate_vson_server: + - vson_server + - disk.write.bytes.rate + feature_vson_server: + - vson_server + - feature + disk.allocation_vson_server: + - vson_server + - disk.allocation + binding_vson_server: + - vson_server + - binding + host_vson_server: + - vson_server + - host + binding_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - binding + network.incoming.bytes.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.bytes.rate + disk.read.requests_vson_server: + - vson_server + - disk.read.requests + requirements: + link_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - link + dependency_vson_server: + - vson_server + - dependency + dependency_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - dependency + local_storage_vson_server: + - vson_server + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml new file mode 100644 index 0000000000..1ed396e9bc --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml @@ -0,0 +1,478 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested_vson_server_with_vol_dual_ip_stack +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.nodes.heat.vson_vm: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + vf_module_id: + label: VF module ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF Module instance + default_gateway: + label: Default gateway + hidden: false + immutable: false + type: string + description: Default gateway. + port_vson_server_oam_net_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + instance_index: + label: Instance Index + hidden: false + immutable: false + type: float + description: Index of the instance. + vnf_name: + label: VF name + hidden: false + immutable: false + type: string + description: Unique name for this VF instance. + oam_net_subnet_prefix_length: + label: OAM net subnet prefix length + hidden: false + immutable: false + type: string + description: Prefix length of the subnet on the OAM network. + vf_module_name: + label: VF module name + hidden: false + immutable: false + type: string + description: Unique name for this VF module instance. + dns_servers: + label: DNS servers + hidden: false + immutable: false + type: list + description: List of DNS servers. + entry_schema: + type: string + oam_net_security_group_id: + label: OAM network security group ID + hidden: false + immutable: false + type: string + description: | + The ID of Security group applied on the port bound to the vSON OAM network. + vson_vm_image_name: + label: vSON base VM image name + hidden: false + immutable: false + type: string + description: VM Image name the vSON instance will be created from. + vnf_id: + label: VF ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF instance. + port_vson_server_oam_net_port_0_network_role: + type: string + required: true + vson_clm_oam_net_ip: + label: vSON Cluster Manager IP + hidden: false + immutable: false + type: string + description: IP of the vSON Cluster Manager. + port_vson_server_oam_net_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_vson_server_oam_net_port_0_subnetpoolid: + type: string + required: true + vson_dc_unit: + label: vSON Data Center name + hidden: false + immutable: false + type: string + description: Name of the vSON Data Center. + oam_net_ips: + label: vSON OAM network IPv4 addresses + hidden: false + immutable: false + type: list + description: Fixed IPv4 assignments for vSON instances on the OAM network. + entry_schema: + type: string + oam_net_subnet_v6_prefix_length: + label: OAM net IPv6 subnet prefix length + hidden: false + immutable: false + type: string + description: OAM network IPv6 subnet prefix length. + vfc_role: + label: VF module ID + hidden: false + immutable: false + type: string + description: Unique ID for this VF Module instance + swift_account_auth_token: + label: Swift account auth token + hidden: false + immutable: false + type: string + description: | + Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 + default_gateway_v6: + label: Default IPv6 gateway + hidden: false + immutable: false + type: string + description: Default IPv6 gateway. + vson_server_group_id: + label: vSON server group ID + hidden: false + immutable: false + type: string + description: | + Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. + vson_vm_flavor_name: + label: Flavor name + hidden: false + immutable: false + type: string + description: The ID or name of the flavor to boot onto. + port_vson_server_oam_net_port_0_network_role_tag: + type: string + required: true + port_vson_server_oam_net_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + availability_zones: + label: Availability zones + hidden: false + immutable: false + type: list + description: List of availability zones. + entry_schema: + type: string + volume_ids: + label: Volumes IDs + hidden: false + immutable: false + type: list + description: List of Volumes IDs. + entry_schema: + type: string + oam_net_v6_ips: + label: vSON OAM network IPv6 addresses + hidden: false + immutable: false + type: list + description: Fixed IPv6 assignments for vSON instances on the OAM network. + entry_schema: + type: string + ntp_servers: + label: NTP servers + hidden: false + immutable: false + type: list + description: List of NTP servers. + entry_schema: + type: string + vson_join_cluster_auth_token: + label: vSON join cluster auth token + hidden: false + immutable: false + type: string + description: | + Authentication Token generated for the user permitted to add a new Datacenter/vSON member to existing vSON Cluster. + oam_net_id: + label: OAM network ID + hidden: false + immutable: false + type: string + description: The ID of the OAM network. + port_vson_server_oam_net_port_0_order: + type: integer + required: true + port_vson_server_oam_net_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vson_vm_names: + label: vSON Cluster leader names + hidden: false + immutable: false + type: list + description: A list of unique names to be issued to the vSON Cluster leaders. + entry_schema: + type: string + node_templates: + vson_server: + type: org.openecomp.resource.vfc.nodes.heat.vson_vm + properties: + flavor: + get_input: vson_vm_flavor_name + availability_zone: + get_input: + - availability_zones + - get_input: instance_index + image: + get_input: vson_vm_image_name + metadata: + vf_module_id: + get_input: vf_module_id + vm_role: + get_input: vfc_role + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + vf_module_name: + get_input: vf_module_name + config_drive: true + user_data_format: RAW + name: + get_input: + - vson_vm_names + - get_input: instance_index + scheduler_hints: + group: + get_input: vson_server_group_id + vson_server_oam_net_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + get_input: port_vson_server_oam_net_port_0_ip_requirements + security_groups: + - get_input: oam_net_security_group_id + network_role: + get_input: port_vson_server_oam_net_port_0_network_role + fixed_ips: + - ip_address: + get_input: + - oam_net_ips + - get_input: instance_index + - ip_address: + get_input: + - oam_net_v6_ips + - get_input: instance_index + subnetpoolid: + get_input: port_vson_server_oam_net_port_0_subnetpoolid + mac_requirements: + get_input: port_vson_server_oam_net_port_0_mac_requirements + name: + str_replace: + template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 + params: + VNF_NAME: + get_input: vnf_name + VNF_ID: + get_input: vnf_id + SERVER_NAME: + get_input: + - vson_vm_names + - get_input: instance_index + exCP_naming: + get_input: port_vson_server_oam_net_port_0_exCP_naming + vlan_requirements: + get_input: port_vson_server_oam_net_port_0_vlan_requirements + network_role_tag: + get_input: port_vson_server_oam_net_port_0_network_role_tag + network: + get_input: oam_net_id + order: + get_input: port_vson_server_oam_net_port_0_order + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vson_server + relationship: tosca.relationships.network.BindsTo + groups: + nested_vson_server_with_vol_dual_ip_stack_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested_vson_server_with_vol_dual_ip_stack.yaml + description: | + The template intended for deploying vSON VM instance. + members: + - vson_server + - vson_server_oam_net_port_0 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm + capabilities: + disk.write.bytes_vson_server: + - vson_server + - disk.write.bytes + disk.device.allocation_vson_server: + - vson_server + - disk.device.allocation + network.incoming.packets_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.packets + memory.usage_vson_server: + - vson_server + - memory.usage + network.incoming.bytes_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.bytes + disk.device.latency_vson_server: + - vson_server + - disk.device.latency + disk.device.write.bytes.rate_vson_server: + - vson_server + - disk.device.write.bytes.rate + disk.device.read.requests_vson_server: + - vson_server + - disk.device.read.requests + memory_vson_server: + - vson_server + - memory + disk.latency_vson_server: + - vson_server + - disk.latency + os_vson_server: + - vson_server + - os + feature_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - feature + instance_vson_server: + - vson_server + - instance + cpu_vson_server: + - vson_server + - cpu + attachment_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - attachment + disk.iops_vson_server: + - vson_server + - disk.iops + network.outgoing.bytes_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outgoing.bytes + disk.device.write.bytes_vson_server: + - vson_server + - disk.device.write.bytes + disk.device.read.bytes.rate_vson_server: + - vson_server + - disk.device.read.bytes.rate + endpoint_vson_server: + - vson_server + - endpoint + vcpus_vson_server: + - vson_server + - vcpus + network.incoming.packets.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.packets.rate + disk.device.read.requests.rate_vson_server: + - vson_server + - disk.device.read.requests.rate + disk.write.requests.rate_vson_server: + - vson_server + - disk.write.requests.rate + disk.capacity_vson_server: + - vson_server + - disk.capacity + disk.device.capacity_vson_server: + - vson_server + - disk.device.capacity + disk.device.iops_vson_server: + - vson_server + - disk.device.iops + disk.device.write.requests.rate_vson_server: + - vson_server + - disk.device.write.requests.rate + network.outpoing.packets_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outpoing.packets + disk.read.bytes_vson_server: + - vson_server + - disk.read.bytes + disk.read.bytes.rate_vson_server: + - vson_server + - disk.read.bytes.rate + disk.device.write.requests_vson_server: + - vson_server + - disk.device.write.requests + network.outgoing.packets.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outgoing.packets.rate + disk.root.size_vson_server: + - vson_server + - disk.root.size + disk.ephemeral.size_vson_server: + - vson_server + - disk.ephemeral.size + memory.resident_vson_server: + - vson_server + - memory.resident + disk.device.read.bytes_vson_server: + - vson_server + - disk.device.read.bytes + scalable_vson_server: + - vson_server + - scalable + network.outgoing.bytes.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.outgoing.bytes.rate + disk.write.requests_vson_server: + - vson_server + - disk.write.requests + disk.usage_vson_server: + - vson_server + - disk.usage + cpu_util_vson_server: + - vson_server + - cpu_util + disk.device.usage_vson_server: + - vson_server + - disk.device.usage + cpu.delta_vson_server: + - vson_server + - cpu.delta + disk.write.bytes.rate_vson_server: + - vson_server + - disk.write.bytes.rate + feature_vson_server: + - vson_server + - feature + disk.allocation_vson_server: + - vson_server + - disk.allocation + binding_vson_server: + - vson_server + - binding + host_vson_server: + - vson_server + - host + binding_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - binding + network.incoming.bytes.rate_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - network.incoming.bytes.rate + disk.read.requests_vson_server: + - vson_server + - disk.read.requests + requirements: + link_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - link + dependency_vson_server: + - vson_server + - dependency + dependency_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - dependency + local_storage_vson_server: + - vson_server + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/EntitlementPoolZusammenDaoImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/EntitlementPoolZusammenDaoImpl.java index f133aaad9a..ffaf7809c8 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/EntitlementPoolZusammenDaoImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/EntitlementPoolZusammenDaoImpl.java @@ -73,8 +73,20 @@ public class EntitlementPoolZusammenDaoImpl implements EntitlementPoolDao { SessionContext context = ZusammenUtil.createSessionContext(); Id itemId = new Id(entitlementPool.getVendorLicenseModelId()); - zusammenAdaptor.saveElement(context, new ElementContext(itemId, - VlmZusammenUtil.getFirstVersionId(context, itemId, zusammenAdaptor)), entitlmentpoolElement, + ElementContext elementContext = new ElementContext(itemId, + VlmZusammenUtil.getFirstVersionId(context, itemId, zusammenAdaptor)); + + Optional epFromDb = zusammenAdaptor.getElementInfo(context, elementContext, + new Id(entitlementPool.getId())); + + if (epFromDb.isPresent()) { + if (entitlmentpoolElement.getRelations() == null) { + entitlmentpoolElement.setRelations(new ArrayList<>()); + } + entitlmentpoolElement.getRelations().addAll(epFromDb.get().getRelations()); + } + + zusammenAdaptor.saveElement(context,elementContext, entitlmentpoolElement, String.format("Update entitlement pool with id %s", entitlementPool.getId())); } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/FeatureGroupDaoZusammenImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/FeatureGroupDaoZusammenImpl.java index 624ffeb05e..6484e83319 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/FeatureGroupDaoZusammenImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/FeatureGroupDaoZusammenImpl.java @@ -204,6 +204,14 @@ public class FeatureGroupDaoZusammenImpl implements FeatureGroupDao { .createRelation(RelationType.FeatureGroupToLicenseKeyGroup, relation)) .collect(Collectors.toList())); + Collection LaRelations = elementInfo.get().getRelations().stream().filter + (rel->rel.getType().equals(RelationType.FeatureGroupToReferencingLicenseAgreement.name())) + .map(rel ->VlmZusammenUtil.createRelation(RelationType + .FeatureGroupToReferencingLicenseAgreement,rel.getEdge2().getElementId().toString())) + .collect(Collectors.toList()); + + featureGroupElement.getRelations().addAll(LaRelations); + zusammenAdaptor .saveElement(context, elementContext, featureGroupElement, "update feature group"); } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/LicenseKeyGroupZusammenDaoImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/LicenseKeyGroupZusammenDaoImpl.java index bf1899cb04..03537a287b 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/LicenseKeyGroupZusammenDaoImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/LicenseKeyGroupZusammenDaoImpl.java @@ -62,14 +62,30 @@ public class LicenseKeyGroupZusammenDaoImpl implements LicenseKeyGroupDao { @Override public void update(LicenseKeyGroupEntity licenseKeyGroup) { - ZusammenElement locenseKeyGroupElement = + ZusammenElement licenseKeyGroupElement = buildLicenseKeyGroupElement(licenseKeyGroup, Action.UPDATE); SessionContext context = ZusammenUtil.createSessionContext(); Id itemId = new Id(licenseKeyGroup.getVendorLicenseModelId()); - zusammenAdaptor.saveElement(context, new ElementContext(itemId, - VlmZusammenUtil.getFirstVersionId(context, itemId, zusammenAdaptor)), - locenseKeyGroupElement, + + ElementContext elementContext = new ElementContext(itemId, + VlmZusammenUtil.getFirstVersionId(context, itemId, zusammenAdaptor)); + + Optional lkgFromDb = zusammenAdaptor.getElementInfo(context, elementContext, + new Id(licenseKeyGroup.getId())); + + if(lkgFromDb.isPresent()) { + + if( licenseKeyGroupElement.getRelations() == null) { + licenseKeyGroupElement.setRelations(new ArrayList<>()); + } + + lkgFromDb.get().getRelations().forEach(relation -> + licenseKeyGroupElement.getRelations().add(relation)); + } + + zusammenAdaptor.saveElement(context, elementContext, + licenseKeyGroupElement, String.format("Update license key group with id %s", licenseKeyGroup.getId())); } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityId.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityId.java index 71c8e4609a..7f5f69de3b 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityId.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityId.java @@ -61,4 +61,11 @@ public class CompositionEntityId { return parentId != null ? parentId.equals(that.parentId) : that.parentId == null; } + + @Override + public String toString() { + return parentId == null + ? id + : parentId.toString() + "/" + id; + } } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/impl/CompositionEntityDataManagerFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/impl/CompositionEntityDataManagerFactoryImpl.java index 54d67e60fe..9383e41a40 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/impl/CompositionEntityDataManagerFactoryImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/impl/CompositionEntityDataManagerFactoryImpl.java @@ -32,6 +32,7 @@ public class CompositionEntityDataManagerFactoryImpl extends CompositionEntityDa @Override public CompositionEntityDataManager createInterface() { + // this class is stateful! it must be recreated from scratch on every use!!! return new CompositionEntityDataManagerImpl( VendorSoftwareProductInfoDaoFactory.getInstance().createInterface(), ComponentDaoFactory.getInstance().createInterface(), diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionEntityDataManagerImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionEntityDataManagerImpl.java index 81cacf75ac..c33b2dd3b4 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionEntityDataManagerImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionEntityDataManagerImpl.java @@ -27,6 +27,8 @@ import org.openecomp.core.utilities.json.JsonUtil; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDao; import org.openecomp.sdc.vendorsoftwareproduct.dao.NetworkDao; @@ -68,6 +70,8 @@ public class CompositionEntityDataManagerImpl implements CompositionEntityDataMa private static final String COMPOSITION_ENTITY_DATA_MANAGER_ERR_MSG = "Invalid input: %s may not be null"; + private static final Logger logger = + LoggerFactory.getLogger(CompositionEntityDataManagerImpl.class); private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage(); private Map entities = new HashMap<>(); @@ -460,7 +464,7 @@ public class CompositionEntityDataManagerImpl implements CompositionEntityDataMa VspQuestionnaireEntity vspQuestionnaireEntity = (VspQuestionnaireEntity) vspEntity.entity; VspDetails vspDetails = vspInfoDao.get(new VspDetails(vspQuestionnaireEntity.getId(), - vspQuestionnaireEntity.getVersion())); + vspQuestionnaireEntity.getVersion())); return vspDetails.getName(); } @@ -545,6 +549,12 @@ public class CompositionEntityDataManagerImpl implements CompositionEntityDataMa } private Collection validateQuestionnaire(CompositionEntityData compositionEntityData) { + logger.debug(String.format("validateQuestionnaire start: " + + "[entity.type]=%s, [entity.id]=%s, [entity.questionnaireString]=%s", + compositionEntityData.entity.getType().name(), + compositionEntityData.entity.getCompositionEntityId().toString(), + compositionEntityData.entity.getQuestionnaireData())); + return JsonUtil.validate( compositionEntityData.entity.getQuestionnaireData() == null ? JsonUtil.object2Json(new Object()) diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java index 2822d958d0..e05c848452 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java @@ -138,7 +138,9 @@ public class CandidateServiceImpl implements CandidateService { FilesDataStructure fileDataStructureFromManifest = createFileDataStructureFromManifest(zipContentMap.getFileContent (SdcCommon.MANIFEST_NAME)); - structure.getArtifacts().addAll(fileDataStructureFromManifest.getArtifacts()); + List structureArtifacts = structure.getArtifacts(); + structureArtifacts.addAll(fileDataStructureFromManifest.getArtifacts().stream().filter + (artifact -> !structureArtifacts.contains(artifact)).collect((Collectors.toList()))); handleArtifactsFromTree(tree, structure); return JsonUtil.object2Json(structure); diff --git a/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/resources/logback.xml b/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/resources/logback.xml index b1c1335302..9c9c06c216 100644 --- a/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/resources/logback.xml +++ b/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/resources/logback.xml @@ -1,282 +1,15 @@ - - + - - - - - - - - - - - - - - - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log.%i - - 1 - 10 - - - - 20MB - - - ${default-log-pattern} - - - - - - - - - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/Error.log - - - - - - AUDIT_MARKER - - NEUTRAL - DENY - - - - - - TRANSACTION_MARKER - - NEUTRAL - DENY - - - - - INFO - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/Error.log.%i - - 1 - 10 - - - - 20MB - - - ${default-log-pattern} - - - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log - - - - - - - TRANSACTION_MARKER - - NEUTRAL - DENY - - - - - - - e.level.toInt() <= DEBUG.toInt() - - - DENY - NEUTRAL - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log.%i - - 1 - 10 - - - - 20MB - + + - ${default-log-pattern} + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/cassandra2zusammen_migration_debug.log - - - - - - - TRANSACTION_MARKER - - NEUTRAL - DENY - - - - - - - e.level.toInt() <= DEBUG.toInt() - - - DENY - NEUTRAL - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug_by_package.log.%i - - 1 - 10 - - - - 20MB - - - ${asdc-debug-log-pattern} - - - - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/audit.log - - - - - - AUDIT_MARKER - - DENY - ACCEPT - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/audit.log.%i - - 1 - 10 - - - - 20MB - - - ${default-log-pattern} - - - - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/transaction.log - - - - - - TRANSACTION_MARKER - - DENY - ACCEPT - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/transaction.log.%i - - 1 - 10 - - - - 20MB - - - ${default-log-pattern} - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - + \ No newline at end of file diff --git a/openecomp-be/tools/migration/cassandra2zusammen.sh b/openecomp-be/tools/migration/cassandra2zusammen.sh index 4765fc3684..6ef90ad3bf 100644 --- a/openecomp-be/tools/migration/cassandra2zusammen.sh +++ b/openecomp-be/tools/migration/cassandra2zusammen.sh @@ -3,8 +3,7 @@ ########################################################################################################### # script name - cassandra2zusammen.sh # run script - ./cassandra2zusammen.sh -# This script migrates ASDC 1st class citizen entities and their sub-entities from Cassandra to -# Zusammen. +# This script migrates ASDC 1st class citizen entities and their sub-entities from Cassandra to Zusammen. # This script should be run when upgrading from 1702 to 1707 ########################################################################################################### @@ -12,6 +11,5 @@ # change exist package and service templates in db java -Dlog.home=/apps/jetty/base/be/logs -Dconfiguration.yaml=/apps/jetty/base/be/config/catalog-be/configuration.yaml -jar openecomp-zusammen-migration-1.0-SNAPSHOT.jar org.openecomp.core.migration.MigrationMain -STATUS="${?}" echo "${STATUS}" echo "All log messages for the Cassandra2Zusammen -migration process are in /apps/jetty/base/be/logs/ASDC/ASDC- -BE/cassandra2zusammen_migration_debug.log" +STATUS="${?}" +echo "${STATUS}" diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/MobProxy.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/MobProxy.java index 6251d1e8b0..bab4508716 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/MobProxy.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/MobProxy.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.ci.tests.execute.setup; import java.net.InetSocketAddress; diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/CustomizationUUIDVerificator.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/CustomizationUUIDVerificator.java index 9cb305deae..1824266f0c 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/CustomizationUUIDVerificator.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/CustomizationUUIDVerificator.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.openecomp.sdc.ci.tests.verificator; import static org.testng.AssertJUnit.assertTrue;