diff options
21 files changed, 599 insertions, 11 deletions
diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/OnapCommandProfileAutoDiscoverRegister.java b/framework/src/main/java/org/onap/cli/fw/cmd/OnapCommandProfileAutoDiscoverRegister.java new file mode 100644 index 00000000..d2609c2b --- /dev/null +++ b/framework/src/main/java/org/onap/cli/fw/cmd/OnapCommandProfileAutoDiscoverRegister.java @@ -0,0 +1,50 @@ +/* + * Copyright 2020 Huawei Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.cli.fw.cmd; + +public interface OnapCommandProfileAutoDiscoverRegister { + + /** + * When profile needs to add the capability where there are multiple operations + * are available and profile wants to translate those operations in to OCS YAML. + * + * Example, swagger HTTP methods to OCS YAML (command) + * + * Steps: + * 1. implement this interface to create OCS YAML for each of the operations + * and store them under <OPEN_CLI_HOME>/open-cli-schema. + * NOTE: Make sure the YAML created are proper and valid, otherwise invalid + * YAML will be ignored by OCOMP registrar. + * + * 2. Invoke this interface when profile is instantiated + * @OnapCommandSchema(type = 'profile name') + public class OnapSampleProfile implements OnapCommandProfileAutoDiscoverRegister { + public OnapHttpCommand() { + super.addDefaultSchemas(OnapCommandHttpConstants.DEFAULT_PARAMETER_HTTP_FILE_NAME); + this.discover(); + } + + public void discover() { + + } + } + * + * 3. Run command schema-refresh to get auto registered into registrar. + * + */ + void discover(); +} diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileDeleteCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileDeleteCommand.java new file mode 100644 index 00000000..393d199b --- /dev/null +++ b/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileDeleteCommand.java @@ -0,0 +1,37 @@ +/* + * 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.fw.cmd.profile; + +import org.onap.cli.fw.cmd.OnapCommand; +import org.onap.cli.fw.error.OnapCommandException; +import org.onap.cli.fw.schema.OnapCommandSchema; +import org.onap.cli.fw.store.OnapCommandProfileStore; + +/** + * Refresh external schema. + * + */ +@OnapCommandSchema(schema = "profile-delete.yaml") +public class OnapProfileDeleteCommand extends OnapCommand { + + @Override + protected void run() throws OnapCommandException { + String profile = getParametersMap().get("profile").getValue().toString(); + + OnapCommandProfileStore.getInstance().removeProfile(profile); + } +}
\ No newline at end of file diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileListCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileListCommand.java new file mode 100644 index 00000000..7e70facc --- /dev/null +++ b/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileListCommand.java @@ -0,0 +1,39 @@ +/* + * 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.fw.cmd.profile; + +import org.onap.cli.fw.cmd.OnapCommand; +import org.onap.cli.fw.error.OnapCommandException; +import org.onap.cli.fw.schema.OnapCommandSchema; +import org.onap.cli.fw.store.OnapCommandProfileStore; + +/** + * Refresh external schema. + * + */ +@OnapCommandSchema(schema = "profile-list.yaml") +public class OnapProfileListCommand extends OnapCommand { + + @Override + protected void run() throws OnapCommandException { + + for (String profile : OnapCommandProfileStore.getInstance().getProfiles()) { + this.getResult().getRecordsMap().get("profile").getValues().add(profile); + } + } + +} diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileSetCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileSetCommand.java new file mode 100644 index 00000000..fa83ace3 --- /dev/null +++ b/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileSetCommand.java @@ -0,0 +1,85 @@ +/* + * 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.fw.cmd.profile; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.onap.cli.fw.cmd.OnapCommand; +import org.onap.cli.fw.error.OnapCommandException; +import org.onap.cli.fw.error.OnapCommandProfileNotFound; +import org.onap.cli.fw.input.cache.OnapCommandParamEntity; +import org.onap.cli.fw.schema.OnapCommandSchema; +import org.onap.cli.fw.store.OnapCommandProfileStore; + +/** + * Refresh external schema. + * + */ +@OnapCommandSchema(schema = "profile-set.yaml") +public class OnapProfileSetCommand extends OnapCommand { + + @Override + protected void run() throws OnapCommandException { + String product = getParametersMap().get("product").getValue().toString(); + String profile = getParametersMap().get("profile").getValue().toString(); + String service = getParametersMap().get("service").getValue().toString(); + String command = getParametersMap().get("command").getValue().toString(); + + Map<String, String> params = (Map<String, String>)getParametersMap().get("parameter").getValue(); + + OnapCommandProfileStore cache = OnapCommandProfileStore.getInstance(); + + String prefix = ""; + if (service.length() > 0) { + prefix += service + ":"; + } + if (command.length() > 0) { + prefix += command + ":"; + } + + Map<String, OnapCommandParamEntity> map = new HashMap<>(); + + try { + for (OnapCommandParamEntity paramsExisting : cache.getInstance().loadParamFromCache(profile)) { + map.put(paramsExisting.getProduct() + ":" + paramsExisting.getName(), paramsExisting); + } + } catch (OnapCommandProfileNotFound e) { + //ignore amd proceed to create + } + + for (Map.Entry<String, String> entry: params.entrySet()) { + String name = prefix + entry.getKey(); + OnapCommandParamEntity entity = new OnapCommandParamEntity(); + entity.setProduct(product); + entity.setName(name); + entity.setValue(entry.getValue()); + + map.put(entity.getProduct() + ":" + entity.getName(), entity); + } + + List<OnapCommandParamEntity> es = new ArrayList<>(); + for (OnapCommandParamEntity e : map.values()) { + es.add(e); + } + + cache.persistProfile( es, profile); + } + +}
\ No newline at end of file diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileShowCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileShowCommand.java new file mode 100644 index 00000000..b3d20217 --- /dev/null +++ b/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileShowCommand.java @@ -0,0 +1,63 @@ +/* + * 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.fw.cmd.profile; + +import org.onap.cli.fw.cmd.OnapCommand; +import org.onap.cli.fw.conf.OnapCommandConstants; +import org.onap.cli.fw.error.OnapCommandException; +import org.onap.cli.fw.input.cache.OnapCommandParamEntity; +import org.onap.cli.fw.schema.OnapCommandSchema; +import org.onap.cli.fw.store.OnapCommandProfileStore; + +/** + * Refresh external schema. + * + */ +@OnapCommandSchema(schema = "profile-show.yaml") +public class OnapProfileShowCommand extends OnapCommand { + + @Override + protected void run() throws OnapCommandException { + String profile = getParametersMap().get("profile").getValue().toString(); + + for (OnapCommandParamEntity param : OnapCommandProfileStore.getInstance().loadParamFromCache(profile)) { + + String product = param.getProduct(); + if (product.equals(OnapCommandConstants.OCLIP_GLOBAL_PROFILE)) { + //profile param is global + product = "*"; + } + this.getResult().getRecordsMap().get("product").getValues().add(product); + + String []name = param.getName().split(":"); //service:command:param-name + String paramName = name[name.length-1]; //always last entry is param name + this.getResult().getRecordsMap().get("parameter").getValues().add(paramName); + this.getResult().getRecordsMap().get("value").getValues().add(param.getValue()); + String service = "*"; + String command = "*"; + if (name.length == 3) { + service = name[0]; + command = name[1]; + } else if (name.length == 2) { + service = name[0]; + } + this.getResult().getRecordsMap().get("service").getValues().add(service); + this.getResult().getRecordsMap().get("command").getValues().add(command); + } + } + +}
\ No newline at end of file diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileUnsetCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileUnsetCommand.java new file mode 100644 index 00000000..06474ec2 --- /dev/null +++ b/framework/src/main/java/org/onap/cli/fw/cmd/profile/OnapProfileUnsetCommand.java @@ -0,0 +1,77 @@ +/* + * 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.fw.cmd.profile; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.onap.cli.fw.cmd.OnapCommand; +import org.onap.cli.fw.error.OnapCommandException; +import org.onap.cli.fw.input.cache.OnapCommandParamEntity; +import org.onap.cli.fw.schema.OnapCommandSchema; +import org.onap.cli.fw.store.OnapCommandProfileStore; + +/** + * Refresh external schema. + * + */ +@OnapCommandSchema(schema = "profile-unset.yaml") +public class OnapProfileUnsetCommand extends OnapCommand { + + @Override + protected void run() throws OnapCommandException { + //mrkanag add feature to remove the profile at product or service or command level + String product = getParametersMap().get("product").getValue().toString(); + String profile = getParametersMap().get("profile").getValue().toString(); + String service = getParametersMap().get("service").getValue().toString(); + String command = getParametersMap().get("command").getValue().toString(); + + List<String> params = (List<String>)getParametersMap().get("parameter").getValue(); + + OnapCommandProfileStore cache = OnapCommandProfileStore.getInstance(); + + String prefix = ""; + if (service.length() > 0) { + prefix += service + ":"; + } + if (command.length() > 0) { + prefix += command + ":"; + } + + Map<String, OnapCommandParamEntity> map = new HashMap<>(); + + for (OnapCommandParamEntity paramsExisting : cache.getInstance().loadParamFromCache(profile)) { + map.put(paramsExisting.getProduct() + ":" + paramsExisting.getName(), paramsExisting); + } + + for (String name: params) { + name = prefix + name; + + if (map.containsKey(product + ":" + name)) + map.remove(product + ":" + name); + } + + List<OnapCommandParamEntity> es = new ArrayList<>(); + for (OnapCommandParamEntity e : map.values()) { + es.add(e); + } + + cache.persistProfile( es, profile); + } +} diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidRegistration.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidRegistration.java index 1c90e9a0..90f8c468 100644 --- a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidRegistration.java +++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidRegistration.java @@ -26,7 +26,7 @@ public class OnapCommandInvalidRegistration extends OnapCommandException { private static final long serialVersionUID = 7722163282274482532L; - public OnapCommandInvalidRegistration(Class cls) { + public OnapCommandInvalidRegistration(Class<?> cls) { super("0x2001", "Invalid commad class " + cls.getCanonicalName() + " registration, it should be derived from " + OnapCommand.class.getCanonicalName()); } diff --git a/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java b/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java index 8092c0fa..5527f94f 100644 --- a/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java +++ b/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java @@ -289,6 +289,6 @@ public class OnapCommandPrint { throw new OnapCommandOutputPrintingFailed(e); // NOSONAR } */ - return ""; + return ""; //NOSONAR } } diff --git a/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaMerger.java b/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaMerger.java index 9a6a4e78..0712603a 100644 --- a/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaMerger.java +++ b/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaMerger.java @@ -35,6 +35,10 @@ public class OnapCommandSchemaMerger { static Logger logger = LoggerFactory.getLogger(OnapCommandSchemaMerger.class); + private OnapCommandSchemaMerger(){ + //It is made private in order to resolve: Utility classes should not have public constructors + } + public static Map<String, Object> mergeSchemas(OnapCommand cmd) throws OnapCommandException { Map<String, Object> mergedResult = new LinkedHashMap<>(); diff --git a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java index d8fdfab9..8f998190 100644 --- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java +++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java @@ -458,8 +458,7 @@ public class OnapCommandExecutionStore { private File getExecutionDir(String executionId) throws OnapCommandExecutionNotFound { File []f = new File(getBasePath()).listFiles((dir, name) -> { - if (name.startsWith(executionId)) return true; - return false; + return name.startsWith(executionId); }); if (f.length == 0) { diff --git a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandDiscoveryUtils.java b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandDiscoveryUtils.java index 4cb95290..53cea2b6 100644 --- a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandDiscoveryUtils.java +++ b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandDiscoveryUtils.java @@ -478,7 +478,7 @@ public class OnapCommandDiscoveryUtils { public static List<Map<String, Object>> createTestSuite(String cmd, String version) throws OnapCommandException { - ArrayList<Map<String, Object>> testSamples = new ArrayList(); + ArrayList<Map<String, Object>> testSamples = new ArrayList<>(); List<Resource> resources = new ArrayList<>(); diff --git a/framework/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand b/framework/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand index 7ca9c783..46061aea 100644 --- a/framework/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand +++ b/framework/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand @@ -26,3 +26,9 @@ org.onap.cli.fw.cmd.execution.OnapCommandExceutionShowCommand org.onap.cli.fw.cmd.execution.OnapCommandExceutionShowDebugCommand org.onap.cli.fw.cmd.execution.OnapCommandExceutionShowOutCommand org.onap.cli.fw.cmd.execution.OnapCommandExceutionShowErrCommand + +org.onap.cli.fw.cmd.profile.OnapProfileListCommand +org.onap.cli.fw.cmd.profile.OnapProfileShowCommand +org.onap.cli.fw.cmd.profile.OnapProfileSetCommand +org.onap.cli.fw.cmd.profile.OnapProfileUnsetCommand +org.onap.cli.fw.cmd.profile.OnapProfileDeleteCommand diff --git a/framework/src/main/resources/open-cli-schema/profile/profile-delete.yaml b/framework/src/main/resources/open-cli-schema/profile/profile-delete.yaml new file mode 100644 index 00000000..7ed3aace --- /dev/null +++ b/framework/src/main/resources/open-cli-schema/profile/profile-delete.yaml @@ -0,0 +1,31 @@ +# 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: profile-delete +description: Delete the given profile + +info: + product: open-cli + service: profile + type: cmd + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com + +parameters: + - name: profile + type: string + description: For a given profile + short_option: n + long_option: profile + is_optional: false
\ No newline at end of file diff --git a/framework/src/main/resources/open-cli-schema/profile/profile-list.yaml b/framework/src/main/resources/open-cli-schema/profile/profile-list.yaml new file mode 100644 index 00000000..3acf3bd9 --- /dev/null +++ b/framework/src/main/resources/open-cli-schema/profile/profile-list.yaml @@ -0,0 +1,31 @@ +# 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: profile-list +description: List available profiles + +info: + product: open-cli + service: profile + type: cmd + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com + +results: + direction: landscape + attributes: + - name: profile + description: profile name + scope: short + type: string
\ No newline at end of file diff --git a/framework/src/main/resources/open-cli-schema/profile/profile-set.yaml b/framework/src/main/resources/open-cli-schema/profile/profile-set.yaml new file mode 100644 index 00000000..50847151 --- /dev/null +++ b/framework/src/main/resources/open-cli-schema/profile/profile-set.yaml @@ -0,0 +1,56 @@ +# 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: profile-set +description: Adds parameter values to a existing or new profile + +info: + product: open-cli + service: profile + type: cmd + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com + +parameters: + - name: profile + type: string + description: For a given profile + short_option: x + long_option: profile + is_optional: false + - name: product + type: string + description: For a given product, if not given then its consider as available for all products. + short_option: l + long_option: product + is_optional: true + default_value: OCLIP-GLOBAL-PROFILE + - name: service + type: string + description: For a given service in a product + short_option: b + long_option: service + is_optional: true + - name: command + type: string + description: For a given command in a product + short_option: c + long_option: command + is_optional: true + - name: parameter + type: map + description: Set of key value pair of parameters and its value + short_option: y + long_option: parameter + is_optional: false diff --git a/framework/src/main/resources/open-cli-schema/profile/profile-show.yaml b/framework/src/main/resources/open-cli-schema/profile/profile-show.yaml new file mode 100644 index 00000000..12e3874a --- /dev/null +++ b/framework/src/main/resources/open-cli-schema/profile/profile-show.yaml @@ -0,0 +1,55 @@ +# 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: profile-show +description: Show the given profile parameters values + +info: + product: open-cli + service: profile + type: cmd + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com + +parameters: + - name: profile + type: string + description: For a given profile + short_option: n + long_option: profile + is_optional: false + +results: + direction: landscape + attributes: + - name: product + description: Profile parameter is applicable across this product + scope: short + type: string + - name: service + description: Profile parameter is applicable across this service + scope: short + type: string + - name: command + description: Profile parameter is applicable to this command + scope: short + type: string + - name: parameter + description: Profile parameter name + scope: short + type: string + - name: value + description: Profile parameter value + scope: short + type: string diff --git a/framework/src/main/resources/open-cli-schema/profile/profile-unset.yaml b/framework/src/main/resources/open-cli-schema/profile/profile-unset.yaml new file mode 100644 index 00000000..8215ef68 --- /dev/null +++ b/framework/src/main/resources/open-cli-schema/profile/profile-unset.yaml @@ -0,0 +1,55 @@ +# 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: profile-unset +description: Removes parameter settings from a existing profile + +info: + product: open-cli + service: profile + type: cmd + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com + +parameters: + - name: profile + type: string + description: For a given profile + short_option: n + long_option: profile + is_optional: false + - name: product + type: string + description: For a given product + short_option: l + long_option: product + is_optional: true + - name: service + type: string + description: For a given service in a product + short_option: b + long_option: service + is_optional: true + - name: command + type: string + description: For a given command in a product + short_option: c + long_option: command + is_optional: true + - name: parameter + type: array + description: Set of key value pair of parameters and its value + short_option: y + long_option: parameter + is_optional: false diff --git a/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java b/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java index b826a1b3..00c311fc 100644 --- a/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java +++ b/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java @@ -158,7 +158,7 @@ public class ValidateSchemaTest { paraValues.put("is_default_param","yes"); list.add(paraValues); values.put("parameters",list); - assertTrue(OnapCommandSchemaLoader.parseSchema(cmd,values,true).size()==2); + assertEquals(2, OnapCommandSchemaLoader.parseSchema(cmd,values,true).size()); } @Test @@ -176,7 +176,7 @@ public class ValidateSchemaTest { list.add(paraValues); attributesValues.put("attributes",list); values.put("results",attributesValues); - assertTrue(OnapCommandSchemaLoader.parseSchema(cmd,values,true).size()==2); + assertEquals(2, OnapCommandSchemaLoader.parseSchema(cmd,values,true).size()); } } diff --git a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java index a1ea7d57..5ce32782 100644 --- a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java +++ b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java @@ -547,8 +547,8 @@ public class OnapCommandUtilsTest { mapExample.put("key1", "paramA"); mapExample.put("key2", "paramB"); OnapCommandUtils.replaceLineFromResults("line $r{paramA} line $r{paramB}", mapExample); - assertTrue(mapExample.get("key1").equals("paramA")); - assertTrue(mapExample.get("key2").equals("paramB")); + assertEquals("paramA", mapExample.get("key1")); + assertEquals("paramB", mapExample.get("key2")); } @Test diff --git a/main/src/main/java/org/onap/cli/main/OnapCli.java b/main/src/main/java/org/onap/cli/main/OnapCli.java index eb75836c..ee9c7b33 100644 --- a/main/src/main/java/org/onap/cli/main/OnapCli.java +++ b/main/src/main/java/org/onap/cli/main/OnapCli.java @@ -252,7 +252,7 @@ public class OnapCli { // - positional-arg1 // - positional-arg2 try { - Map<String, Object> values = (Map<String, Object>) OnapCommandDiscoveryUtils.loadYaml(this.paramFile); + Map<String, Object> values = OnapCommandDiscoveryUtils.loadYaml(this.paramFile); for (Entry<String, Object> cmdsParam: values.entrySet()) { for (Object param: (List)cmdsParam.getValue()) { diff --git a/profiles/http/src/test/java/org/onap/cli/fw/http/utils/OnapCommandUtilsTest.java b/profiles/http/src/test/java/org/onap/cli/fw/http/utils/OnapCommandUtilsTest.java index 7ad3c3ff..89504fb7 100644 --- a/profiles/http/src/test/java/org/onap/cli/fw/http/utils/OnapCommandUtilsTest.java +++ b/profiles/http/src/test/java/org/onap/cli/fw/http/utils/OnapCommandUtilsTest.java @@ -223,7 +223,7 @@ public class OnapCommandUtilsTest { HttpInput httpInput = new HttpInput(); httpInput.setMultiparts(multiparts); HttpInput input = OnapCommandHttpUtils.populateParameters(params, httpInput); - assertTrue(input != null); + assertNotNull(input); } } |