aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordfilppi <dewayne@cloudify.co>2017-12-26 23:28:12 +0000
committerdfilppi <dewayne@cloudify.co>2017-12-26 23:30:26 +0000
commitd87a4650dd96e0263febd042e8f5c67b77810df1 (patch)
treeb76ff18b80c33e97f7a6dfff79320c2ceeca71c8
parent18266f843b047531ba4ec5c5ef5cb5f148863a1a (diff)
Added module to build for aria-rest-server
Change-Id: Ifd4dc937ba4047fd2de98c9f96d3202a55199b21 Issue-ID: SO-362 Signed-off-by: DeWayne Filppi <dewayne@cloudify.co>
-rw-r--r--aria/aria-rest-server/pom.xml6
-rw-r--r--pom.xml5
2 files changed, 6 insertions, 5 deletions
diff --git a/aria/aria-rest-server/pom.xml b/aria/aria-rest-server/pom.xml
index cf39f262e9..d7e4a49311 100644
--- a/aria/aria-rest-server/pom.xml
+++ b/aria/aria-rest-server/pom.xml
@@ -76,12 +76,12 @@
<configuration>
<executable>python</executable>
<arguments>
- <argument>${session.executionRootDirectory}/build.py</argument>
+ <argument>${project.basedir}/build.py</argument>
</arguments>
<environmentVariables>
<MVN_PHASE>package</MVN_PHASE>
<WHEEL_NAME>${wheel.name}</WHEEL_NAME>
- <INPUT_DIR>${session.executionRootDirectory}/src/main/python/aria-rest</INPUT_DIR>
+ <INPUT_DIR>${project.basedir}/src/main/python/aria-rest</INPUT_DIR>
<OUTPUT_DIR>${project.build.directory}</OUTPUT_DIR>
</environmentVariables>
</configuration>
@@ -93,7 +93,7 @@
<configuration>
<executable>python</executable>
<arguments>
- <argument>${session.executionRootDirectory}/build.py</argument>
+ <argument>${project.basedir}/build.py</argument>
</arguments>
<environmentVariables>
<MVN_PHASE>deploy</MVN_PHASE>
diff --git a/pom.xml b/pom.xml
index c7a3b3196e..db1644d401 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,14 +24,15 @@
<url>http://www.onap.org/</url>
</organization>
<modules>
- <module>common</module>
+ <!-- <module>common</module>
<module>mso-api-handlers</module>
<module>mso-catalog-db</module>
<module>adapters</module>
<module>asdc-controller</module>
<module>status-control</module>
<module>bpmn</module>
- <module>packages</module>
+ <module>packages</module> -->
+ <module>aria/aria-rest-server</module>
</modules>
<properties>
<project.mso.base.folder>.</project.mso.base.folder>
hlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ }
tosca_definitions_version: tosca_simple_yaml_1_1_0
topology_template:
    policies:
    -   operational.restart:
            type: onap.policies.controlloop.operational.common.Drools
            type_version: 1.0.0
            version: 1.0.0
            metadata:
                policy-id: operational.restart
            properties:
                id: ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e
                timeout: 3600
                abatement: true
                trigger: unique-policy-id-1-restart
                operations:
                -   id: unique-policy-id-1-restart
                    description: Restart the VM
                    operation:
                        actor: APPC
                        operation: Restart
                        target:
                            targetType: VNF
                    timeout: 1200
                    retries: 3
                    success: final_success
                    failure: final_failure
                    failure_timeout: final_failure_timeout
                    failure_retries: final_failure_retries
                    failure_exception: final_failure_exception
                    failure_guard: final_failure_guard
                controllerName: usecases