From 8e80ed629dc934e105835c653cd988f488e4e6fe Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam Date: Thu, 29 Aug 2019 15:44:10 +0530 Subject: [PATCH] Split sdc into onboarding and catalog Issue-ID: CLI-166 Change-Id: I25bac40b8e5ebb92fd852c27782ef56ce0c7a795 Signed-off-by: Kanagaraj Manickam k00365106 --- ...OnapSdcCatalogBasicAuthLoginCommandDublin.java} | 4 +- ...apSdcOnboardingBasicAuthLoginCommandDublin.java | 24 +++++++++++ .../services/org.onap.cli.fw.cmd.OnapCommand | 3 +- ...ml => basic-login-onap-sdc-catalog-dublin.yaml} | 2 +- .../basic-login-onap-sdc-onboarding-dublin.yaml | 50 ++++++++++++++++++++++ 5 files changed, 79 insertions(+), 4 deletions(-) rename products/onap-dublin/auth/src/main/java/org/onap/cli/cmd/auth/{OnapSdcBasicAuthLoginCommandDublin.java => OnapSdcCatalogBasicAuthLoginCommandDublin.java} (82%) create mode 100644 products/onap-dublin/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcOnboardingBasicAuthLoginCommandDublin.java rename products/onap-dublin/auth/src/main/resources/open-cli-schema/{basic-login-onap-sdc-dublin.yaml => basic-login-onap-sdc-catalog-dublin.yaml} (95%) create mode 100644 products/onap-dublin/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-onboarding-dublin.yaml diff --git a/products/onap-dublin/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandDublin.java b/products/onap-dublin/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcCatalogBasicAuthLoginCommandDublin.java similarity index 82% rename from products/onap-dublin/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandDublin.java rename to products/onap-dublin/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcCatalogBasicAuthLoginCommandDublin.java index 942523b3..5cd96981 100644 --- a/products/onap-dublin/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandDublin.java +++ b/products/onap-dublin/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcCatalogBasicAuthLoginCommandDublin.java @@ -19,6 +19,6 @@ 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-dublin.yaml") -public class OnapSdcBasicAuthLoginCommandDublin extends BasicAuthLoginCommand { +@OnapCommandSchema(schema = "basic-login-onap-sdc-catalog-dublin.yaml") +public class OnapSdcCatalogBasicAuthLoginCommandDublin extends BasicAuthLoginCommand { } diff --git a/products/onap-dublin/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcOnboardingBasicAuthLoginCommandDublin.java b/products/onap-dublin/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcOnboardingBasicAuthLoginCommandDublin.java new file mode 100644 index 00000000..1e92bee9 --- /dev/null +++ b/products/onap-dublin/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcOnboardingBasicAuthLoginCommandDublin.java @@ -0,0 +1,24 @@ +/* + * Copyright © Intel Corporation 2019 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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-onboarding-dublin.yaml") +public class OnapSdcOnboardingBasicAuthLoginCommandDublin extends BasicAuthLoginCommand { +} diff --git a/products/onap-dublin/auth/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand b/products/onap-dublin/auth/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand index 87558847..a9030521 100644 --- a/products/onap-dublin/auth/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand +++ b/products/onap-dublin/auth/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand @@ -14,5 +14,6 @@ org.onap.cli.cmd.auth.OnapBasicAuthLoginCommandDublin org.onap.cli.cmd.auth.OnapBasicAuthLogoutCommandDublin -org.onap.cli.cmd.auth.OnapSdcBasicAuthLoginCommandDublin +org.onap.cli.cmd.auth.OnapSdcCatalogBasicAuthLoginCommandDublin +org.onap.cli.cmd.auth.OnapSdcOnboardingBasicAuthLoginCommandDublin org.onap.cli.cmd.auth.OnapPolicyBasicAuthLoginCommandDublin diff --git a/products/onap-dublin/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-dublin.yaml b/products/onap-dublin/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-catalog-dublin.yaml similarity index 95% rename from products/onap-dublin/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-dublin.yaml rename to products/onap-dublin/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-catalog-dublin.yaml index 4ddec702..3a5872bc 100644 --- a/products/onap-dublin/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-dublin.yaml +++ b/products/onap-dublin/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-catalog-dublin.yaml @@ -14,7 +14,7 @@ open_cli_schema_version: 1.0 -name: sdc-basic-login +name: sdc.catalog-basic-login description: ONAP basic login auth command diff --git a/products/onap-dublin/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-onboarding-dublin.yaml b/products/onap-dublin/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-onboarding-dublin.yaml new file mode 100644 index 00000000..dc075c0b --- /dev/null +++ b/products/onap-dublin/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-onboarding-dublin.yaml @@ -0,0 +1,50 @@ +# Copyright © Intel Corporation 2019 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT 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.onboarding-basic-login + +description: ONAP basic login auth command + + +info: + product: onap-dublin + 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 -- 2.16.6