Merge pull request #78 from oracle/issue#74-parse-negative-integers

parse negative integers in YAML

Author: robertpatrick

core/src/main/antlr4/oracle/weblogic/deploy/yaml/Yaml.g4

@@ -260,7 +260,7 @@ fragment FALSE_TEXT
     ;
 
 fragment INT_TEXT
-    : [1-9] [0-9]*
+    : [+-]? [1-9] [0-9]*
     ;
 
 fragment FLOAT_TEXT

core/src/test/python/validation_test.py

@@ -22,9 +22,6 @@ class ValidationTestCase(unittest.TestCase):
     _program_name = 'validation_test'
     _class_name = 'ValidationTestCase'
     _resources_dir = '../../test-classes'
-    _model_file = _resources_dir + '/test_jms_mail.json'
-    _variable_file = None
-    _archive_file = None
     # _variable_file = _resources_dir + "/test_sub_variable_file.properties"
     # _model_file = _resources_dir + '/test_empty.json'
     # _variable_file = _resources_dir + "/test_invalid_variable_file.properties"
@@ -37,20 +34,15 @@ def setUp(self):
 
     def testModelValidation(self):
 
+        _model_file = self._resources_dir + '/test_jms_mail.json'
         _method_name = 'testModelValidation'
 
         mw_home = os.environ['MW_HOME']
         args_map = {
             '-oracle_home': mw_home,
-            '-model_file': self._model_file
+            '-model_file': _model_file
         }
 
-        if self._variable_file is not None:
-            args_map['-variable_file'] = self._variable_file
-
-        if self._variable_file is not None:
-            args_map['-archive_file'] = self._archive_file
-
         model_context = ModelContext('ValidationTestCase', args_map)
 
         try:
@@ -85,5 +77,43 @@ def testIsCompatibleDataType(self):
                                   class_name=self._class_name, method_name=_method_name)
             self.assertEqual(retval, True)
 
+    def testYamlModelValidation(self):
+        """
+            Parse and validate a YAML model with '-' list type and attributes with negative values.
+        """
+
+        _model_file = self._resources_dir + '/simple-model.yaml'
+        _archive_file = self._resources_dir + "/SingleAppDomain.zip"
+        _method_name = 'testYamlModelValidation'
+
+        mw_home = os.environ['MW_HOME']
+        args_map = {
+            '-oracle_home': mw_home,
+            '-model_file': _model_file,
+            '-archive_file': _archive_file
+        }
+
+        model_context = ModelContext('ValidationTestCase', args_map)
+
+        try:
+            model_dictionary = FileToPython(model_context.get_model_file()).parse()
+            model_validator = Validator(model_context,
+                                        wlst_mode=WlstModes.ONLINE)
+            return_code = model_validator.validate_in_tool_mode(model_dictionary,
+                                                                model_context.get_variable_file(),
+                                                                model_context.get_archive_file_name())
+            self._logger.info('The Validator.validate_in_tool_mode() call returned {0}',
+                              Validator.ReturnCode.from_value(return_code),
+                              class_name=self._class_name, method_name=_method_name)
+        except TranslateException, te:
+            return_code = Validator.ReturnCode.STOP
+            self._logger.severe('WLSDPLY-20009',
+                                self._program_name,
+                                model_context.get_model_file(),
+                                te.getLocalizedMessage(), error=te,
+                                class_name=self._class_name, method_name=_method_name)
+
+        self.assertNotEqual(return_code, Validator.ReturnCode.STOP)
+
 if __name__ == '__main__':
     unittest.main()

core/src/test/resources/simple-model.yaml

@@ -1,7 +1,6 @@
 domainInfo:
     # The DOMAIN_TYPE field is for reference only.  The actual type of domain created is controlled by
     # the -domain_type parameter passed to the createDomain shell script.
-    DOMAIN_TYPE: 'WLS'
     AdminUserName: 'weblogic'
     AdminPassword: 'welcome1'
     ServerStartMode: 'prod'
@@ -10,6 +9,7 @@ topology:
     Name: simple_domain
     Cluster:
         mycluster:
+            MulticastTTL: -1
     Server:
         AdminServer:
             ListenAddress: 127.0.0.1
@@ -49,44 +49,44 @@ resources:
                     MaxCapacity: 15
                     TestTableName: SQL ISVALID
                     TestConnectionsOnReserve: true
-            Generic2:
-                Target: mycluster
-                JdbcResource:
-                    JDBCDataSourceParams:
-                        JNDIName: [
-                            jdbc/generic2,
-                            jdbc/special2
-                        ]
-                        GlobalTransactionsProtocol: TwoPhaseCommit
-                    JDBCDriverParams:
-                        DriverName: oracle.jdbc.xa.client.OracleXADataSource
-                        URL : 'jdbc:oracle:thin:@//den00chv.us.oracle.com:1521/PDBORCL'
-                        PasswordEncrypted: welcome1
-                        Properties:
-                            user:
-                                Value: jshum
-                            oracle.net.CONNECT_TIMEOUT:
-                                Value: 5000
-                            oracle.jdbc.ReadTimeout:
-                                Value: 30000
-                    JDBCConnectionPoolParams:
-                        InitialCapacity: 3
-                        MaxCapacity: 15                         # This is a comment
-                        TestTableName: SQL ISVALID              # This is a comment
-                        TestConnectionsOnReserve: true          # This is a comment
+        Generic2:
+            Target: mycluster
+            JdbcResource:
+                JDBCDataSourceParams:
+                    JNDIName: [
+                        jdbc/generic2,
+                        jdbc/special2
+                    ]
+                    GlobalTransactionsProtocol: TwoPhaseCommit
+                JDBCDriverParams:
+                    DriverName: oracle.jdbc.xa.client.OracleXADataSource
+                    URL : 'jdbc:oracle:thin:@//den00chv.us.oracle.com:1521/PDBORCL'
+                    PasswordEncrypted: welcome1
+                    Properties:
+                        user:
+                            Value: jshum
+                        oracle.net.CONNECT_TIMEOUT:
+                            Value: 5000
+                        oracle.jdbc.ReadTimeout:
+                            Value: 30000
+                JDBCConnectionPoolParams:
+                    InitialCapacity: 3
+                    MaxCapacity: 15                         # This is a comment
+                    TestTableName: SQL ISVALID              # This is a comment
+                    TestConnectionsOnReserve: true          # This is a comment
 
 # This is a comment
 appDeployments:
     Application:
         # Quote needed because of hyphen in string
         'get-listen-address-app':
-            SourcePath: 'wlsdeploy/apps/get-listen-address-app.war'
+            SourcePath: 'wlsdeploy/applications/get-listen-address-app.war'
             Target: mycluster
             ModuleType: war
             StagingMode: nostage
             PlanStagingMode: nostage
         simpleear :
-            SourcePath: wlsdeploy/apps/simpleear.ear
+            SourcePath: wlsdeploy/applications/simpleear.ear
             Target: mycluster
             ModuleType: ear
             StagingMode: nostage