diff options
| author |   subhash kumar singh <subhash.kumar.singh@huawei.com> | 2018-09-11 11:14:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-11 11:14:40 +0000 |
| commit | 23878941ee88186865c136c112a451afee3a13f3 (patch) | |
| tree | d3ed11e10279dbae07ae6badd60ddc73ae13371c | |
| parent | a710113a4929cf77f6c702be65d1382037236afe (diff) | |
| parent | 8974991b85999fd0aa34a5bf656cb7f3ee61ce33 (diff) | |
Merge changes Ibd1602e1,I06fd9dcd,Ifda56f2f,I76e8d69a,I93df28ee, ...
* changes:
Casablanca: Add catalog profile
Casablanca: profile
Casablanca: Add Policy specific login
Casablanca: Add sdc specific login
Casablanca: Add basic login and logout
Casablanca: Add Auth plugin
13 files changed, 430 insertions, 1 deletions
diff --git a/deployment/zip/src/main/release/data/onap-casablanca-profile.json b/deployment/zip/src/main/release/data/onap-casablanca-profile.json new file mode 100644 index 00000000..36c4a5a9 --- /dev/null +++ b/deployment/zip/src/main/release/data/onap-casablanca-profile.json @@ -0,0 +1,57 @@ +[ + { + "product" : "onap-casablanca", + "name" : "aai:host-url", + "value" : "https://192.168.17.7:8443" + }, + { + "product" : "onap-casablanca", + "name" : "aai:host-username", + "value" : "AAI" + }, + { + "product" : "onap-casablanca", + "name" : "aai:host-password", + "value" : "AAI" + }, + { + "product" : "onap-casablanca", + "name" : "msb:host-url", + "value" : "http://192.168.17.5:80" + }, + { + "product" : "onap-casablanca", + "name" : "sdc:host-url", + "value" : "http://192.168.17.13:8080" + }, + { + "product" : "onap-casablanca", + "name" : "sdc:host-username", + "value" : "cs_0008" + }, + { + "product" : "onap-casablanca", + "name" : "sdc:host-password", + "value" : "demo123456!" + }, + { + "product" : "onap-casablanca", + "name" : "policy:host-url", + "value" : "http://192.168.17.19:8443" + }, + { + "product" : "onap-casablanca", + "name" : "so:host-url", + "value" : "http://192.168.17.3:8080" + }, + { + "product" : "onap-casablanca", + "name" : "so:host-username", + "value" : "InfraPortalClien" + }, + { + "product" : "onap-casablanca", + "name" : "so:host-password", + "value" : "password1$" + } +]
\ No newline at end of file diff --git a/products/onap-casablanca/auth/pom.xml b/products/onap-casablanca/auth/pom.xml new file mode 100644 index 00000000..0c97638b --- /dev/null +++ b/products/onap-casablanca/auth/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2018 Huawei Technologies Co., Ltd. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-casablanca</artifactId> + <version>2.0.3</version> + </parent> + + <artifactId>cli-products-onap-casablanca-auth</artifactId> + <name>cli/products/onap-casablanca/auth</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-casablanca/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandCasablanca.java b/products/onap-casablanca/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandCasablanca.java new file mode 100644 index 00000000..4078c709 --- /dev/null +++ b/products/onap-casablanca/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandCasablanca.java @@ -0,0 +1,24 @@ +/* + * Copyright 2018 Huawei Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.cli.cmd.auth; + +import org.onap.cli.fw.http.cmd.BasicAuthLoginCommand; +import org.onap.cli.fw.schema.OnapCommandSchema; + +@OnapCommandSchema(schema = "basic-login-onap-casablanca.yaml") +public class OnapBasicAuthLoginCommandCasablanca extends BasicAuthLoginCommand { +} diff --git a/products/onap-casablanca/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandCasablanca.java b/products/onap-casablanca/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandCasablanca.java new file mode 100644 index 00000000..ed9ecf33 --- /dev/null +++ b/products/onap-casablanca/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandCasablanca.java @@ -0,0 +1,24 @@ +/* + * Copyright 2018 Huawei Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.cli.cmd.auth; + +import org.onap.cli.fw.http.cmd.BasicAuthLogoutCommand; +import org.onap.cli.fw.schema.OnapCommandSchema; + +@OnapCommandSchema(schema = "basic-logout-onap-casablanca.yaml") +public class OnapBasicAuthLogoutCommandCasablanca extends BasicAuthLogoutCommand { +} diff --git a/products/onap-casablanca/auth/src/main/java/org/onap/cli/cmd/auth/OnapPolicyBasicAuthLoginCommandCasablanca.java b/products/onap-casablanca/auth/src/main/java/org/onap/cli/cmd/auth/OnapPolicyBasicAuthLoginCommandCasablanca.java new file mode 100644 index 00000000..3f75887f --- /dev/null +++ b/products/onap-casablanca/auth/src/main/java/org/onap/cli/cmd/auth/OnapPolicyBasicAuthLoginCommandCasablanca.java @@ -0,0 +1,24 @@ +/* + * Copyright 2018 Huawei Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.cli.cmd.auth; + +import org.onap.cli.fw.http.cmd.BasicAuthLoginCommand; +import org.onap.cli.fw.schema.OnapCommandSchema; + +@OnapCommandSchema(schema = "basic-login-onap-policy-casablanca.yaml") +public class OnapPolicyBasicAuthLoginCommandCasablanca extends BasicAuthLoginCommand { +} diff --git a/products/onap-casablanca/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandCasablanca.java b/products/onap-casablanca/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandCasablanca.java new file mode 100644 index 00000000..4825bb11 --- /dev/null +++ b/products/onap-casablanca/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandCasablanca.java @@ -0,0 +1,24 @@ +/* + * Copyright 2018 Huawei Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.cli.cmd.auth; + +import org.onap.cli.fw.http.cmd.BasicAuthLoginCommand; +import org.onap.cli.fw.schema.OnapCommandSchema; + +@OnapCommandSchema(schema = "basic-login-onap-sdc-casablanca.yaml") +public class OnapSdcBasicAuthLoginCommandCasablanca extends BasicAuthLoginCommand { +} diff --git a/products/onap-casablanca/auth/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand b/products/onap-casablanca/auth/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand new file mode 100644 index 00000000..40ef093d --- /dev/null +++ b/products/onap-casablanca/auth/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand @@ -0,0 +1,18 @@ +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +org.onap.cli.cmd.auth.OnapBasicAuthLoginCommandCasablanca +org.onap.cli.cmd.auth.OnapBasicAuthLogoutCommandCasablanca +org.onap.cli.cmd.auth.OnapSdcBasicAuthLoginCommandCasablanca +org.onap.cli.cmd.auth.OnapPolicyBasicAuthLoginCommandCasablanca
\ No newline at end of file diff --git a/products/onap-casablanca/auth/src/main/resources/open-cli-schema/basic-login-onap-casablanca.yaml b/products/onap-casablanca/auth/src/main/resources/open-cli-schema/basic-login-onap-casablanca.yaml new file mode 100644 index 00000000..fee90ce4 --- /dev/null +++ b/products/onap-casablanca/auth/src/main/resources/open-cli-schema/basic-login-onap-casablanca.yaml @@ -0,0 +1,43 @@ +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 + +name: basic-login + +description: ONAP basic login auth command + +info: + product: onap-casablanca + service: basic-auth + type: auth + author: ONAP CLI Team onap-discuss@lists.onap.org + +results: + direction: portrait + attributes: + - name: Authorization + description: Authorization + scope: short + type: string + - name: X-TransactionId + description: X-TransactionId + scope: short + type: string + default_value: req-$s{uuid} + - name: X-FromAppId + description: X-FromAppId + scope: short + type: string + default_value: ONAP CLI diff --git a/products/onap-casablanca/auth/src/main/resources/open-cli-schema/basic-login-onap-policy-casablanca.yaml b/products/onap-casablanca/auth/src/main/resources/open-cli-schema/basic-login-onap-policy-casablanca.yaml new file mode 100644 index 00000000..43c0525c --- /dev/null +++ b/products/onap-casablanca/auth/src/main/resources/open-cli-schema/basic-login-onap-policy-casablanca.yaml @@ -0,0 +1,46 @@ +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 + +name: policy-basic-login + +description: ONAP basic login auth command + + +info: + product: onap-casablanca + service: policy-basic-auth + type: auth + author: ONAP CLI Team onap-discuss@lists.onap.org + + +results: + direction: portrait + attributes: + - name: Authorization + description: Authorization + scope: short + type: string + default_value: Basic dGVzdHBkcDphbHBoYTEyMw== + - name: Environment + description: Environment + scope: short + type: string + default_value: ONAP-CLI + - name: ClientAuth + description: Client Auth + scope: short + type: string + default_value: cHl0aG9uOnRlc3Q=
\ No newline at end of file diff --git a/products/onap-casablanca/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-casablanca.yaml b/products/onap-casablanca/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-casablanca.yaml new file mode 100644 index 00000000..6d046ed5 --- /dev/null +++ b/products/onap-casablanca/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-casablanca.yaml @@ -0,0 +1,50 @@ +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 + +name: sdc-basic-login + +description: ONAP basic login auth command + + +info: + product: onap-casablanca + service: sdc-basic-auth + type: auth + author: ONAP CLI Team onap-discuss@lists.onap.org + + +results: + direction: portrait + attributes: + - name: Authorization + description: Authorization + scope: short + type: string + - name: X-TransactionId + description: X-TransactionId + scope: short + type: string + default_value: req-$s{uuid} + - name: X-FromAppId + description: X-FromAppId + scope: short + type: string + default_value: ONAP CLI + - name: USER_ID + description: USER_ID for sdc + scope: short + type: string + default_value: ${host-username}
\ No newline at end of file diff --git a/products/onap-casablanca/auth/src/main/resources/open-cli-schema/basic-logout-onap-casablanca.yaml b/products/onap-casablanca/auth/src/main/resources/open-cli-schema/basic-logout-onap-casablanca.yaml new file mode 100644 index 00000000..f31b9a16 --- /dev/null +++ b/products/onap-casablanca/auth/src/main/resources/open-cli-schema/basic-logout-onap-casablanca.yaml @@ -0,0 +1,34 @@ +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 + +name: basic-logout + +description: ONAP basic logout auth command + +info: + product: onap-casablanca + service: basic-auth + type: auth + author: ONAP CLI Team onap-discuss@lists.onap.org + + +parameters: + - name: host-username + is_include: false + - name: host-password + is_include: false + - name: no-auth + is_include: false
\ No newline at end of file diff --git a/products/onap-casablanca/catalog/pom.xml b/products/onap-casablanca/catalog/pom.xml new file mode 100644 index 00000000..0a4e806c --- /dev/null +++ b/products/onap-casablanca/catalog/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2018 Huawei Technologies Co., Ltd. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-casablanca</artifactId> + <version>2.0.3</version> + </parent> + + <artifactId>cli-products-onap-casablanca-catalog</artifactId> + <name>cli/products/onap-casablanca/catalog</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-casablanca/pom.xml b/products/onap-casablanca/pom.xml index de003b5d..f33930b8 100644 --- a/products/onap-casablanca/pom.xml +++ b/products/onap-casablanca/pom.xml @@ -31,7 +31,10 @@ <name>cli/products/onap-casablanca</name> <packaging>pom</packaging> - + <modules> + <module>auth</module> + <module>catalog</module> + </modules> <build> <pluginManagement> <plugins> |